vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-05 22:30:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: centralize acp session resolution guards

Browse Source
This commit is contained in:
Peter Steinberger
2026-03-08 17:11:05 +00:00
parent 25d0aa7296
commit f6cb77134c
3 changed files with 50 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/auto-reply/reply/commands-acp/lifecycle.ts
View File

@@ -1,5 +1,6 @@
import { randomUUID } from "node:crypto";
import { getAcpSessionManager } from "../../../acp/control-plane/manager.js";
import { resolveAcpSessionResolutionError } from "../../../acp/control-plane/manager.utils.js";
import {
cleanupFailedAcpSpawn,
type AcpSpawnRuntimeCloseHandle,
@@ -10,7 +11,6 @@ import {
resolveAcpDispatchPolicyError,
resolveAcpDispatchPolicyMessage,
} from "../../../acp/policy.js";
import { AcpRuntimeError } from "../../../acp/runtime/errors.js";
import {
resolveAcpSessionCwd,
resolveAcpThreadSessionDetailLines,
@@ -390,24 +390,13 @@ function resolveAcpSessionForCommandOrStop(params: {
cfg: params.cfg,
sessionKey: params.sessionKey,
});
if (resolved.kind === "none") {
const error = resolveAcpSessionResolutionError(resolved);
if (error) {
return stopWithText(
collectAcpErrorText({
error: new AcpRuntimeError(
"ACP_SESSION_INIT_FAILED",
`Session is not ACP-enabled: ${params.sessionKey}`,
),
error,
fallbackCode: "ACP_SESSION_INIT_FAILED",
fallbackMessage: "Session is not ACP-enabled.",
}),
);
}
if (resolved.kind === "stale") {
return stopWithText(
collectAcpErrorText({
error: resolved.error,
fallbackCode: "ACP_SESSION_INIT_FAILED",
fallbackMessage: resolved.error.message,
fallbackMessage: error.message,
}),
);
}