kiokuko-dsh 0.2.37 → 0.2.39
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.ja.md +28 -0
- package/README.ko.md +26 -0
- package/README.md +28 -0
- package/README.zh-CN.md +26 -0
- package/dist/client.cjs +97 -5
- package/dist/client.d.ts.map +1 -1
- package/dist/dsh/answer-review/contracts.js +1 -1
- package/dist/dsh/answer-review/contracts.js.map +1 -1
- package/dist/dsh/completion-report.d.ts +29 -1
- package/dist/dsh/completion-report.d.ts.map +1 -1
- package/dist/dsh/completion-report.js +58 -14
- package/dist/dsh/completion-report.js.map +1 -1
- package/dist/dsh/config.d.ts +12 -0
- package/dist/dsh/config.d.ts.map +1 -1
- package/dist/dsh/config.js +3 -0
- package/dist/dsh/config.js.map +1 -1
- package/dist/dsh/core/host.d.ts +12 -0
- package/dist/dsh/core/host.d.ts.map +1 -1
- package/dist/dsh/core/host.js +8 -4
- package/dist/dsh/core/host.js.map +1 -1
- package/dist/dsh/core/index.d.ts +32 -0
- package/dist/dsh/core/index.d.ts.map +1 -1
- package/dist/dsh/decisions/diagnostics.d.ts +4 -3
- package/dist/dsh/decisions/diagnostics.d.ts.map +1 -1
- package/dist/dsh/decisions/diagnostics.js +2 -2
- package/dist/dsh/decisions/diagnostics.js.map +1 -1
- package/dist/dsh/decisions/host.d.ts.map +1 -1
- package/dist/dsh/decisions/host.js +5 -0
- package/dist/dsh/decisions/host.js.map +1 -1
- package/dist/dsh/decisions/intent-assessment.d.ts +24 -3
- package/dist/dsh/decisions/intent-assessment.d.ts.map +1 -1
- package/dist/dsh/decisions/intent-assessment.js +36 -10
- package/dist/dsh/decisions/intent-assessment.js.map +1 -1
- package/dist/dsh/decisions/openai.d.ts.map +1 -1
- package/dist/dsh/decisions/openai.js +3 -0
- package/dist/dsh/decisions/openai.js.map +1 -1
- package/dist/dsh/decisions/service.d.ts +2 -0
- package/dist/dsh/decisions/service.d.ts.map +1 -1
- package/dist/dsh/decisions/service.js +9 -0
- package/dist/dsh/decisions/service.js.map +1 -1
- package/dist/dsh/guardrail/contracts.d.ts +1 -1
- package/dist/dsh/guardrail/contracts.d.ts.map +1 -1
- package/dist/dsh/guardrail/evidence.d.ts.map +1 -1
- package/dist/dsh/guardrail/evidence.js +4 -0
- package/dist/dsh/guardrail/evidence.js.map +1 -1
- package/dist/dsh/host-adapter.d.ts +2 -0
- package/dist/dsh/host-adapter.d.ts.map +1 -1
- package/dist/dsh/host-adapter.js +9 -5
- package/dist/dsh/host-adapter.js.map +1 -1
- package/dist/dsh/index.d.ts +10 -2
- package/dist/dsh/index.d.ts.map +1 -1
- package/dist/dsh/index.js +6 -3
- package/dist/dsh/index.js.map +1 -1
- package/dist/dsh/lisp/host-tool-dispatch.d.ts +2 -0
- package/dist/dsh/lisp/host-tool-dispatch.d.ts.map +1 -1
- package/dist/dsh/lisp/host-tool-dispatch.js +9 -1
- package/dist/dsh/lisp/host-tool-dispatch.js.map +1 -1
- package/dist/dsh/lisp/http.d.ts.map +1 -1
- package/dist/dsh/lisp/http.js +13 -1
- package/dist/dsh/lisp/http.js.map +1 -1
- package/dist/dsh/lisp/manager.d.ts +4 -0
- package/dist/dsh/lisp/manager.d.ts.map +1 -1
- package/dist/dsh/lisp/manager.js +35 -9
- package/dist/dsh/lisp/manager.js.map +1 -1
- package/dist/dsh/lisp/native-stop-receipt.d.ts +25 -0
- package/dist/dsh/lisp/native-stop-receipt.d.ts.map +1 -0
- package/dist/dsh/lisp/native-stop-receipt.js +22 -0
- package/dist/dsh/lisp/native-stop-receipt.js.map +1 -0
- package/dist/dsh/lisp/proposal-batch.d.ts.map +1 -1
- package/dist/dsh/lisp/proposal-batch.js +2 -1
- package/dist/dsh/lisp/proposal-batch.js.map +1 -1
- package/dist/dsh/lisp/sandbox.d.ts +1 -0
- package/dist/dsh/lisp/sandbox.d.ts.map +1 -1
- package/dist/dsh/lisp/sandbox.js +2 -2
- package/dist/dsh/lisp/sandbox.js.map +1 -1
- package/dist/dsh/lisp/status-text.d.ts +34 -0
- package/dist/dsh/lisp/status-text.d.ts.map +1 -0
- package/dist/dsh/lisp/status-text.js +65 -0
- package/dist/dsh/lisp/status-text.js.map +1 -0
- package/dist/dsh/lisp/surface.d.ts.map +1 -1
- package/dist/dsh/lisp/surface.js +44 -10
- package/dist/dsh/lisp/surface.js.map +1 -1
- package/dist/dsh/live-config.d.ts +49 -0
- package/dist/dsh/live-config.d.ts.map +1 -0
- package/dist/dsh/live-config.js +77 -0
- package/dist/dsh/live-config.js.map +1 -0
- package/dist/dsh/managed-file-deployment.d.ts +6 -0
- package/dist/dsh/managed-file-deployment.d.ts.map +1 -1
- package/dist/dsh/managed-file-deployment.js +17 -1
- package/dist/dsh/managed-file-deployment.js.map +1 -1
- package/dist/dsh/managed-operation-journal.d.ts +5 -1
- package/dist/dsh/managed-operation-journal.d.ts.map +1 -1
- package/dist/dsh/managed-operation-journal.js +17 -4
- package/dist/dsh/managed-operation-journal.js.map +1 -1
- package/dist/dsh/on-demand-intake.d.ts +21 -4
- package/dist/dsh/on-demand-intake.d.ts.map +1 -1
- package/dist/dsh/on-demand-intake.js +167 -55
- package/dist/dsh/on-demand-intake.js.map +1 -1
- package/dist/dsh/setup.d.ts.map +1 -1
- package/dist/dsh/setup.js +8 -2
- package/dist/dsh/setup.js.map +1 -1
- package/dist/dsh/startup-defaults-settings.d.ts +20 -0
- package/dist/dsh/startup-defaults-settings.d.ts.map +1 -0
- package/dist/dsh/startup-defaults-settings.js +27 -0
- package/dist/dsh/startup-defaults-settings.js.map +1 -0
- package/dist/dsh/startup-defaults.d.ts +41 -0
- package/dist/dsh/startup-defaults.d.ts.map +1 -0
- package/dist/dsh/startup-defaults.js +29 -0
- package/dist/dsh/startup-defaults.js.map +1 -0
- package/dist/dsh/task-startup.d.ts +7 -0
- package/dist/dsh/task-startup.d.ts.map +1 -1
- package/dist/dsh/task-startup.js +30 -9
- package/dist/dsh/task-startup.js.map +1 -1
- package/dist/enno-oduno/verifier.d.ts.map +1 -1
- package/dist/enno-oduno/verifier.js +5 -1
- package/dist/enno-oduno/verifier.js.map +1 -1
- package/dist/locale/en.json +1 -1
- package/dist/locale/ja.json +1 -1
- package/dist/locale/ko.json +1 -1
- package/dist/locale/zh-CN.json +1 -1
- package/docs/README.ja.md +1 -0
- package/docs/README.md +1 -0
- package/docs/answer-review.md +8 -0
- package/docs/lisp.md +45 -4
- package/docs/micro-judge.md +1 -1
- package/docs/on-demand-intake.md +2 -0
- package/docs/typed-decisions.md +13 -3
- package/lisp/supervisor.mjs +90 -9
- package/package.json +1 -1
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { z } from 'zod';
|
|
2
|
+
const failure = z.object({
|
|
3
|
+
isError: z.literal(true),
|
|
4
|
+
error: z.object({ info: z.object({ code: z.literal('ABORTED') }) }),
|
|
5
|
+
meta: z.object({ termination: z.object({
|
|
6
|
+
version: z.literal(1), kind: z.literal('managed-range-empty'),
|
|
7
|
+
callId: z.string(), rootCallId: z.string(), ownerId: z.string(), sessionId: z.string(), cwd: z.string(),
|
|
8
|
+
}).strict() }),
|
|
9
|
+
});
|
|
10
|
+
/** Consume only the pinned host Bash dispatch result, never Lisp output or session text. */
|
|
11
|
+
export function nativeStopReceipt(result, expected) {
|
|
12
|
+
const parsed = failure.safeParse(result);
|
|
13
|
+
if (!parsed.success)
|
|
14
|
+
return undefined;
|
|
15
|
+
const observed = parsed.data.meta.termination;
|
|
16
|
+
if (observed.callId !== expected.callId || observed.rootCallId !== expected.rootCallId
|
|
17
|
+
|| observed.ownerId !== expected.ownerId || observed.sessionId !== expected.sessionId || observed.cwd !== expected.cwd)
|
|
18
|
+
return undefined;
|
|
19
|
+
return { route: 'native', operationId: observed.callId, state: 'cancelled',
|
|
20
|
+
cancelled: true, processStopped: true, host: observed };
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=native-stop-receipt.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"native-stop-receipt.js","sourceRoot":"","sources":["../../../src/dsh/lisp/native-stop-receipt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AASvB,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC;IACvB,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;IACxB,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC;IACnE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC;YACrC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,qBAAqB,CAAC;YAC7D,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE;SACxG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;CACf,CAAC,CAAA;AAEF,4FAA4F;AAC5F,MAAM,UAAU,iBAAiB,CAAC,MAAe,EAAE,QAA4B;IAC7E,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IACxC,IAAI,CAAC,MAAM,CAAC,OAAO;QAAE,OAAO,SAAS,CAAA;IACrC,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAA;IAC7C,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,IAAI,QAAQ,CAAC,UAAU,KAAK,QAAQ,CAAC,UAAU;WACjF,QAAQ,CAAC,OAAO,KAAK,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,SAAS,KAAK,QAAQ,CAAC,SAAS,IAAI,QAAQ,CAAC,GAAG,KAAK,QAAQ,CAAC,GAAG;QACtH,OAAO,SAAS,CAAA;IAClB,OAAO,EAAE,KAAK,EAAE,QAAiB,EAAE,WAAW,EAAE,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,WAAoB;QAC1F,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;AAC3D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proposal-batch.d.ts","sourceRoot":"","sources":["../../../src/dsh/lisp/proposal-batch.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAE9D,OAAO,EAAoC,KAAK,SAAS,EAAE,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAA;AACrG,OAAO,EAA0F,KAAK,YAAY,EAAuB,KAAK,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9K,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"proposal-batch.d.ts","sourceRoot":"","sources":["../../../src/dsh/lisp/proposal-batch.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAE9D,OAAO,EAAoC,KAAK,SAAS,EAAE,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAA;AACrG,OAAO,EAA0F,KAAK,YAAY,EAAuB,KAAK,YAAY,EAAE,MAAM,YAAY,CAAA;AAC9K,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAG3C,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,SAAS,GAAG,WAAW,GAAG,aAAa,GAAG,SAAS,CAAC;IACrF,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAC1G;AAgBD,+EAA+E;AAC/E,qBAAa,iBAAiB;;IAGhB,QAAQ,CAAC,OAAO,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,MAAM,EAAE,CAAC;QAAC,SAAS,CAAC,EAAE,gBAAgB,CAAC;QAAC,OAAO,EAAE,MAAM,OAAO,CAAC;QACzJ,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QACtD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAC,SAAS,EAAC,IAAI,EAAC,MAAM,EAAC,IAAI,EAAC,MAAM,CAAC,MAAM,EAAC,OAAO,CAAC,EAAC,MAAM,EAAC,WAAW,EAAC,MAAM,EAAC,MAAM,KAAG,OAAO,CAAC,GAAG,CAAC,CAAA;KAAE;gBAFjG,OAAO,EAAE;QAAE,KAAK,EAAE,SAAS,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,cAAc,EAAE,MAAM,MAAM,EAAE,CAAC;QAAC,SAAS,CAAC,EAAE,gBAAgB,CAAC;QAAC,OAAO,EAAE,MAAM,OAAO,CAAC;QACzJ,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QACtD,OAAO,CAAC,EAAE,CAAC,KAAK,EAAC,SAAS,EAAC,IAAI,EAAC,MAAM,EAAC,IAAI,EAAC,MAAM,CAAC,MAAM,EAAC,OAAO,CAAC,EAAC,MAAM,EAAC,WAAW,EAAC,MAAM,EAAC,MAAM,KAAG,OAAO,CAAC,GAAG,CAAC,CAAA;KAAE;IAEhH,KAAK,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,aAAa,EAAE,EAAE,MAAM,EAAE,WAAW,EACvH,WAAW,CAAC,EAAE,YAAY,CAAC,aAAa,CAAC,EAAE,QAAQ,CAAC,EAAE;QAAE,OAAO,EAAE,YAAY,EAAE,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;KAAE,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CA+HtJ"}
|
|
@@ -3,6 +3,7 @@ import { mkdir } from 'node:fs/promises';
|
|
|
3
3
|
import { confirm } from './approval.js';
|
|
4
4
|
import { digest, fail, failure, LispError } from './contracts.js';
|
|
5
5
|
import { applyChange, backupUsage, checkedBytes, freezeChange, restoreBytes, sameFile, snapshot } from './files.js';
|
|
6
|
+
import { isManagedAdmissionDenied } from '../managed-operation-runner.js';
|
|
6
7
|
const contentHash = (text) => createHash('sha256').update(text).digest('hex');
|
|
7
8
|
/** A single replacement hunk, with common surrounding lines removed, not an LLM summary. */
|
|
8
9
|
function changeDiff(before, after) {
|
|
@@ -63,7 +64,7 @@ export class LispProposalBatch {
|
|
|
63
64
|
}
|
|
64
65
|
catch (error) {
|
|
65
66
|
const problem = failure(error);
|
|
66
|
-
outcomes.push({ id: `${evalId}:${index}`, path: request.path, state: attempted ? 'UNKNOWN' : 'NOT_APPLIED', code: problem.code, message: problem.message });
|
|
67
|
+
outcomes.push({ id: `${evalId}:${index}`, path: request.path, state: attempted && !isManagedAdmissionDenied(error) ? 'UNKNOWN' : 'NOT_APPLIED', code: problem.code, message: problem.message });
|
|
67
68
|
break;
|
|
68
69
|
}
|
|
69
70
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"proposal-batch.js","sourceRoot":"","sources":["../../../src/dsh/lisp/proposal-batch.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"proposal-batch.js","sourceRoot":"","sources":["../../../src/dsh/lisp/proposal-batch.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ export interface Launch {
|
|
|
15
15
|
cwd: string;
|
|
16
16
|
seccompPath?: string;
|
|
17
17
|
group?: boolean;
|
|
18
|
+
namespaceInfo?: boolean;
|
|
18
19
|
}
|
|
19
20
|
export declare function executable(name: string): Promise<string>;
|
|
20
21
|
export declare function prepareLayout(base: string, library: string): Promise<SandboxLayout>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../../src/dsh/lisp/sandbox.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,aAAa;IAAG,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAA;CAAE;AAC5K,MAAM,WAAW,MAAM;IAAG,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAA;CAAE;
|
|
1
|
+
{"version":3,"file":"sandbox.d.ts","sourceRoot":"","sources":["../../../src/dsh/lisp/sandbox.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,aAAa;IAAG,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAA;CAAE;AAC5K,MAAM,WAAW,MAAM;IAAG,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE;AAEhK,wBAAsB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAM9D;AAKD,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAMzF;AACD,oFAAoF;AACpF,wBAAsB,aAAa,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,UAAQ,EAAE,SAAS,SAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAgDlK"}
|
package/dist/dsh/lisp/sandbox.js
CHANGED
|
@@ -83,9 +83,9 @@ export async function sandboxLaunch(layout, program, args, generation, protocol
|
|
|
83
83
|
}
|
|
84
84
|
catch { /* optional runtime directory */ }
|
|
85
85
|
}
|
|
86
|
-
return { command: await executable('bwrap'), args: ['--unshare-all', '--die-with-parent', '--new-session', '--clearenv', ...Object.entries(env).flatMap(([k, v]) => ['--setenv', k, v]),
|
|
86
|
+
return { command: await executable('bwrap'), args: ['--unshare-all', '--die-with-parent', '--new-session', '--info-fd', '5', '--clearenv', ...Object.entries(env).flatMap(([k, v]) => ['--setenv', k, v]),
|
|
87
87
|
...binds, '--proc', '/proc', '--dev', '/dev', '--bind', layout.scratch, layout.scratch, '--bind', layout.cache, layout.cache,
|
|
88
|
-
'--seccomp', '4', '--chdir', cwd, '--', binary, ...args], env, cwd, seccompPath };
|
|
88
|
+
'--seccomp', '4', '--chdir', cwd, '--', binary, ...args], env, cwd, seccompPath, namespaceInfo: true };
|
|
89
89
|
}
|
|
90
90
|
return fail('UNSUPPORTED_OS', 'Common Lisp は macOS と Linux で利用できます。');
|
|
91
91
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandbox.js","sourceRoot":"","sources":["../../../src/dsh/lisp/sandbox.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"sandbox.js","sourceRoot":"","sources":["../../../src/dsh/lisp/sandbox.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
interface StatusOperation {
|
|
2
|
+
id: string;
|
|
3
|
+
state: string;
|
|
4
|
+
kind?: string;
|
|
5
|
+
}
|
|
6
|
+
interface ManagedOperation extends StatusOperation {
|
|
7
|
+
route: string;
|
|
8
|
+
}
|
|
9
|
+
export interface LispStatusView {
|
|
10
|
+
state?: string;
|
|
11
|
+
enabled?: boolean;
|
|
12
|
+
error?: {
|
|
13
|
+
message?: string;
|
|
14
|
+
} | null;
|
|
15
|
+
operationCount?: number;
|
|
16
|
+
pendingCount?: number;
|
|
17
|
+
pendingStates?: Record<string, number>;
|
|
18
|
+
operations?: StatusOperation[];
|
|
19
|
+
managedOperations?: ManagedOperation[];
|
|
20
|
+
managedUnknownOperations?: ManagedOperation[];
|
|
21
|
+
managedOperationCount?: number;
|
|
22
|
+
managedOperationsTruncated?: boolean;
|
|
23
|
+
managedReconciliationRequired?: boolean;
|
|
24
|
+
codingPreparation?: {
|
|
25
|
+
phase?: string;
|
|
26
|
+
};
|
|
27
|
+
hot?: {
|
|
28
|
+
tools?: unknown[];
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
/** Human status is a bounded view. JSON and operation diagnostics retain the full evidence. */
|
|
32
|
+
export declare function formatLispStatus(value: LispStatusView): string;
|
|
33
|
+
export {};
|
|
34
|
+
//# sourceMappingURL=status-text.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"status-text.d.ts","sourceRoot":"","sources":["../../../src/dsh/lisp/status-text.ts"],"names":[],"mappings":"AAAA,UAAU,eAAe;IAAG,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE;AACtE,UAAU,gBAAiB,SAAQ,eAAe;IAAG,KAAK,EAAE,MAAM,CAAA;CAAE;AACpE,MAAM,WAAW,cAAc;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAC,GAAG,IAAI,CAAA;IACpE,cAAc,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAC,MAAM,CAAC,CAAA;IACrF,UAAU,CAAC,EAAE,eAAe,EAAE,CAAC;IAAC,iBAAiB,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAAC,wBAAwB,CAAC,EAAE,gBAAgB,EAAE,CAAA;IACrH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAAC,0BAA0B,CAAC,EAAE,OAAO,CAAC;IAAC,6BAA6B,CAAC,EAAE,OAAO,CAAA;IAC7G,iBAAiB,CAAC,EAAE;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAC,CAAC;IAAC,GAAG,CAAC,EAAE;QAAC,KAAK,CAAC,EAAE,OAAO,EAAE,CAAA;KAAC,CAAA;CAChE;AAOD,+FAA+F;AAC/F,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,cAAc,GAAG,MAAM,CA6C9D"}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
const pending = new Set(['RUNNING', 'UNKNOWN', 'APPLYING', 'AWAITING_APPROVAL']);
|
|
2
|
+
const phases = {
|
|
3
|
+
selected: 'Lisp を選択(先行試作は任意)', cancelled: '取消済み・作業を保持', unavailable: '質問を利用できません',
|
|
4
|
+
choice_pending: 'Lisp の選択待ち', prototype_required: '試作待ち(未検証)', result_pending: '試作結果の確認待ち(未検証)',
|
|
5
|
+
reviewed: '試作結果を確認済み(タスクの検証は別)', declined: '通常ツールを使用', failed: '試作失敗・自動再試行停止',
|
|
6
|
+
};
|
|
7
|
+
/** Human status is a bounded view. JSON and operation diagnostics retain the full evidence. */
|
|
8
|
+
export function formatLispStatus(value) {
|
|
9
|
+
const lines = ['Lisp: ' + (value.state ?? '状態不明')];
|
|
10
|
+
const phase = value.codingPreparation?.phase;
|
|
11
|
+
if (phase && phases[phase])
|
|
12
|
+
lines.push('試作: ' + phases[phase]);
|
|
13
|
+
if (value.error?.message) {
|
|
14
|
+
const message = value.error.message.replace(/\s+/gu, ' ').trim();
|
|
15
|
+
lines.push('停止理由: ' + message.slice(0, 240) + (message.length > 240 ? '…' : ''));
|
|
16
|
+
}
|
|
17
|
+
const operations = value.operations ?? [];
|
|
18
|
+
const unresolved = operations.filter(o => pending.has(o.state)).sort((a, b) => Number(b.state === 'UNKNOWN') - Number(a.state === 'UNKNOWN'));
|
|
19
|
+
const count = value.operationCount ?? operations.length;
|
|
20
|
+
const pendingCount = value.pendingCount ?? (value.pendingStates ? Object.values(value.pendingStates).reduce((a, b) => a + b, 0) : unresolved.length);
|
|
21
|
+
lines.push('操作履歴: ' + count + '件 / 未解決: ' + pendingCount + '件');
|
|
22
|
+
for (const operation of unresolved.slice(0, 3)) {
|
|
23
|
+
lines.push('未解決 ' + operation.state + ' · ' + (operation.kind ?? 'Lisp'));
|
|
24
|
+
lines.push(' 詳細: /kioku-lisp diagnostics ' + operation.id);
|
|
25
|
+
}
|
|
26
|
+
if (pendingCount > 3)
|
|
27
|
+
lines.push('未解決はほかに' + (pendingCount - 3) + '件あります。');
|
|
28
|
+
const managed = value.managedOperations ?? [];
|
|
29
|
+
const externalCount = value.managedOperationCount ?? managed.length;
|
|
30
|
+
if (externalCount) {
|
|
31
|
+
lines.push('外部処理の未解決: ' + externalCount + '件');
|
|
32
|
+
const unique = new Map([...(value.managedUnknownOperations ?? []), ...managed].map(o => [o.id, o]));
|
|
33
|
+
const ordered = [...unique.values()].sort((a, b) => Number(b.state === 'unknown') - Number(a.state === 'unknown'));
|
|
34
|
+
for (const operation of ordered.slice(0, 3)) {
|
|
35
|
+
lines.push('外部 ' + operation.route + '/' + operation.kind + ' · ' + operation.state);
|
|
36
|
+
lines.push(' 詳細: /kioku-lisp diagnostics ' + operation.id);
|
|
37
|
+
}
|
|
38
|
+
if (externalCount > 3 || value.managedOperationsTruncated)
|
|
39
|
+
lines.push('表示は先頭' + Math.min(3, managed.length) + '件です。');
|
|
40
|
+
}
|
|
41
|
+
if (value.managedReconciliationRequired || value.state === 'RECONCILIATION_REQUIRED') {
|
|
42
|
+
lines.push('外部処理の結果・停止は未確定です。上の詳細と元のホストreceiptを照合してください。');
|
|
43
|
+
lines.push('確認できた操作だけを /kioku-lisp abandon-managed 操作ID で終了し、その後に /kioku-lisp recover で再開します。');
|
|
44
|
+
lines.push('Lisp の再起動だけでは外部処理を確定できず、自動再実行もしません。');
|
|
45
|
+
}
|
|
46
|
+
else if (value.state === 'STOP_UNCONFIRMED' || value.state === 'STOPPING') {
|
|
47
|
+
lines.push('停止をまだ確認できません。/kioku-lisp cancel で停止を確認し、実行結果を照合してください。');
|
|
48
|
+
}
|
|
49
|
+
else if (value.state === 'RECOVERY_REQUIRED') {
|
|
50
|
+
if (unresolved.some(o => o.kind === 'proposal'))
|
|
51
|
+
lines.push('ファイルとバックアップを照合してください。採用しない変更だけを /kioku-lisp abandon 操作ID で終了できます。');
|
|
52
|
+
lines.push('上の詳細で結果を照合した後、/kioku-lisp recover で再開できます。過去のコードは自動再実行しません。');
|
|
53
|
+
}
|
|
54
|
+
else if (value.state === 'DISABLED')
|
|
55
|
+
lines.push('利用する場合は /kioku-lisp enable');
|
|
56
|
+
else if (value.state === 'SUSPENDED')
|
|
57
|
+
lines.push('休止中です。次の利用で自動起動します。変数・関数定義は保持されません。');
|
|
58
|
+
else if (value.state === 'READY' || value.state === 'TASK_READY')
|
|
59
|
+
lines.push('利用できます。');
|
|
60
|
+
if (value.hot?.tools)
|
|
61
|
+
lines.push('共有関数: ' + value.hot.tools.length);
|
|
62
|
+
lines.push('履歴の詳細: /kioku-lisp status --json');
|
|
63
|
+
return lines.join('\n');
|
|
64
|
+
}
|
|
65
|
+
//# sourceMappingURL=status-text.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"status-text.js","sourceRoot":"","sources":["../../../src/dsh/lisp/status-text.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"surface.d.ts","sourceRoot":"","sources":["../../../src/dsh/lisp/surface.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"surface.d.ts","sourceRoot":"","sources":["../../../src/dsh/lisp/surface.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,uCAAuC,CAAA;AAI1F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAE9D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAM1D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AACvB,OAAO,KAAK,EAAE,cAAc,IAAI,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAGtE,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAmB1C,OAAO,EAAkE,KAAK,iBAAiB,EAAkB,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AA8DtJ,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAa8F,CAAA;AAEpH,uFAAuF;AACvF,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,iBAAiB,EAAE,YAAY,CAAC,EAAE,eAAe,EAAE,SAAS,CAAC,EAAE,eAAe,EAAE,kBAAkB,CAAC,EAAE,6BAA6B,GAAG,OAAO,CAAC;IAAE,IAAI,IAAI,IAAI,CAAC;IAAC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAAC,OAAO,EAAE,WAAW,CAAA;CAAE,CAAC,CAwpB/R;AAkBD,wBAAgB,cAAc,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAiCrD"}
|
package/dist/dsh/lisp/surface.js
CHANGED
|
@@ -1,5 +1,8 @@
|
|
|
1
|
-
import { createLispHostDispatch } from './host-tool-dispatch.js';
|
|
2
|
-
import {
|
|
1
|
+
import { createLispHostDispatch, lispHostToolWasNotDispatched } from './host-tool-dispatch.js';
|
|
2
|
+
import { formatLispStatus } from './status-text.js';
|
|
3
|
+
import { ManagedDispatchDenied, managedAdmissionDenied, currentManagedOperation, observeManagedResult } from '../managed-operation-runner.js';
|
|
4
|
+
import { ManagedOperationJournal } from '../managed-operation-journal.js';
|
|
5
|
+
import { nativeStopReceipt } from './native-stop-receipt.js';
|
|
3
6
|
import { canonicalContentHash } from '../../serialization/validate.js';
|
|
4
7
|
import { isCodingWorkflowTool } from '../coding-workflow/host.js';
|
|
5
8
|
import { AsyncLocalStorage } from 'node:async_hooks';
|
|
@@ -15,7 +18,7 @@ import { DecisionError } from '../decisions/contracts.js';
|
|
|
15
18
|
import { realpathSync } from 'node:fs';
|
|
16
19
|
import { randomUUID } from 'node:crypto';
|
|
17
20
|
import { readFile } from 'node:fs/promises';
|
|
18
|
-
import { dirname, join } from 'node:path';
|
|
21
|
+
import { dirname, isAbsolute, join } from 'node:path';
|
|
19
22
|
import { fileURLToPath } from 'node:url';
|
|
20
23
|
import { z } from 'zod';
|
|
21
24
|
import { LispManager } from './manager.js';
|
|
@@ -37,7 +40,7 @@ import { isSavedLispResultRead } from '../memory-application.js';
|
|
|
37
40
|
import { attachmentInput } from './attachment-input.js';
|
|
38
41
|
import { HttpTypeSafeClient } from '../typesafe/client.js';
|
|
39
42
|
import { typeSafeCredentials } from '../typesafe/command.js';
|
|
40
|
-
import { LISP_TOOLS, failure, fail, identifier, renderResult } from './contracts.js';
|
|
43
|
+
import { LISP_TOOLS, LispError, failure, fail, identifier, renderResult } from './contracts.js';
|
|
41
44
|
const fenceKey = Symbol.for('kiokuko.lisp.host-fence.v1');
|
|
42
45
|
const PROTOCOL_OWNED_TOOLS = ['kioku_read', 'kioku_write', 'kioku_edit', 'kioku_exec', 'kioku_result'];
|
|
43
46
|
const PROTOCOL_OWNED_EFFECTS = new Set(['kioku_write', 'kioku_edit', 'kioku_exec']);
|
|
@@ -85,6 +88,8 @@ function restrictInheritedTools(tools, scopedTools, agent, names) {
|
|
|
85
88
|
return scopedTools.restrict({ allow: inherited });
|
|
86
89
|
}
|
|
87
90
|
function text(value) {
|
|
91
|
+
if (value && typeof value === 'object' && 'enabled' in value)
|
|
92
|
+
return formatLispStatus(value);
|
|
88
93
|
const result = value;
|
|
89
94
|
const hot = value;
|
|
90
95
|
const shared = hot.tools ?? hot.hot?.tools;
|
|
@@ -145,6 +150,8 @@ export async function mountLispSurface(ctx, runtime, config, skillPrompts, decis
|
|
|
145
150
|
const execute = () => dispatchHostTool({ callId: callId ?? `lisp-owned-${crypto.randomUUID()}`, name, arguments: args, agent, parent: Symbol('lisp-owned'), signal: signal ? AbortSignal.any([binding.signal, signal]) : binding.signal,
|
|
146
151
|
...(taskLease ? { [TASK_AUTHORITY]: taskLease } : {}) });
|
|
147
152
|
const result = await (taskLease ? withTaskAuthority(taskLease, execute) : execute());
|
|
153
|
+
if (lispHostToolWasNotDispatched(result))
|
|
154
|
+
managedAdmissionDenied(new LispError('OWNED_EXECUTION_NOT_DISPATCHED', result.error?.message ?? JSON.stringify(result.content), '元の要求とホストの拒否理由を確認してください。この変更は適用されておらず、Lisp の復旧は不要です。'));
|
|
148
155
|
if (result.isError)
|
|
149
156
|
fail('OWNED_EXECUTION_FAILED', JSON.stringify(result.content));
|
|
150
157
|
return result.value;
|
|
@@ -519,11 +526,16 @@ export async function mountLispSurface(ctx, runtime, config, skillPrompts, decis
|
|
|
519
526
|
if (tools.get('bash', binding.agent) !== pinned.definition || tools.get('bash', binding.agent)?.execute !== pinned.execute)
|
|
520
527
|
fail('STALE_NATIVE_COMMAND', 'Native Bash implementation changed.');
|
|
521
528
|
const quote = (value) => "'" + value.replaceAll("'", "'\\''") + "'";
|
|
529
|
+
const directory = input.directory ?? binding.owner.root;
|
|
530
|
+
// Bash resolves relative workdirs against the session. Pin that
|
|
531
|
+
// exact absolute spelling before dispatch so the stop receipt
|
|
532
|
+
// can be compared without guessing path/symlink equivalence.
|
|
533
|
+
const workdir = isAbsolute(directory) ? directory : `${binding.owner.root}/${directory}`;
|
|
522
534
|
const child = { name: 'bash', callId: `lisp-native-${randomUUID()}`, agent: binding.agent, parent: execution.token ?? Symbol('lisp-native-command'),
|
|
523
535
|
...(execution.rootCallId ?? execution.callId ? { rootCallId: execution.rootCallId ?? execution.callId } : {}),
|
|
524
536
|
...(execution.toolSet ? { toolSet: execution.toolSet } : {}),
|
|
525
537
|
arguments: { command: [input.program, ...input.argv].map(quote).join(' '), description: 'Run the requested Lisp command through native Bash',
|
|
526
|
-
workdir
|
|
538
|
+
workdir, timeoutMs: input.timeoutMs }, signal: AbortSignal.any([binding.signal, signal]) };
|
|
527
539
|
const commandAdmission = { current: () => {
|
|
528
540
|
try {
|
|
529
541
|
this.assertCurrent();
|
|
@@ -533,6 +545,14 @@ export async function mountLispSurface(ctx, runtime, config, skillPrompts, decis
|
|
|
533
545
|
return false;
|
|
534
546
|
}
|
|
535
547
|
} };
|
|
548
|
+
const managed = currentManagedOperation();
|
|
549
|
+
if (managed)
|
|
550
|
+
await managed.database(db => {
|
|
551
|
+
const journal = new ManagedOperationJournal(db);
|
|
552
|
+
if (managed.kind !== 'process' || journal.readScope(managed.scopeId).sessionId !== binding.owner.sessionId)
|
|
553
|
+
fail('STALE_NATIVE_COMMAND', 'Native command journal owner changed.');
|
|
554
|
+
journal.attachOriginalRef(managed.operationId, child.callId);
|
|
555
|
+
});
|
|
536
556
|
// Observe the registry's exact dispatch stage, not an error string:
|
|
537
557
|
// policy rejection returns before tools/execute is reached.
|
|
538
558
|
let dispatchStarted = false;
|
|
@@ -557,6 +577,12 @@ export async function mountLispSurface(ctx, runtime, config, skillPrompts, decis
|
|
|
557
577
|
if (result.isError) {
|
|
558
578
|
if (!dispatchStarted)
|
|
559
579
|
throw new ManagedDispatchDenied('Host rejected tool before dispatch.');
|
|
580
|
+
const stopped = nativeStopReceipt(result, { callId: child.callId, rootCallId: child.rootCallId ?? child.callId,
|
|
581
|
+
ownerId: binding.agent.id, sessionId: binding.owner.sessionId, cwd: child.arguments.workdir });
|
|
582
|
+
if (stopped && managed) {
|
|
583
|
+
await observeManagedResult(managed, { receipt: stopped });
|
|
584
|
+
fail('NATIVE_COMMAND_CANCELLED', 'Native command was cancelled and its managed process range stopped. Earlier effects may remain; no command was retried.');
|
|
585
|
+
}
|
|
560
586
|
fail('NATIVE_COMMAND_UNCONFIRMED', 'Native command did not return a confirmed result; inspect its host receipt before retrying.');
|
|
561
587
|
}
|
|
562
588
|
const value = result.value;
|
|
@@ -569,8 +595,7 @@ export async function mountLispSurface(ctx, runtime, config, skillPrompts, decis
|
|
|
569
595
|
if (['running', 'stopping'].includes(terminal.status))
|
|
570
596
|
fail('STOP_UNCONFIRMED', `Native job ${value.jobId} has not stopped.`);
|
|
571
597
|
jobs.remove(value.jobId, binding.agent.id);
|
|
572
|
-
|
|
573
|
-
return { code: null, stdout: value.output ?? '', stderr: '', timedOut: true, receipt: { route: 'native', processStopped: true } };
|
|
598
|
+
fail('STOP_UNCONFIRMED', `Native job ${value.jobId} reported settlement without an observed managed-range stop receipt; inspect the original host call before retrying.`);
|
|
574
599
|
}
|
|
575
600
|
this.assertCurrent();
|
|
576
601
|
if (value.exitCode !== 0 || value.timedOut)
|
|
@@ -826,12 +851,19 @@ export async function mountLispSurface(ctx, runtime, config, skillPrompts, decis
|
|
|
826
851
|
register(binding.agent);
|
|
827
852
|
return binding.owner;
|
|
828
853
|
}, (sessionId, signal) => recover(owner(agents.get(sessionId)), signal)));
|
|
829
|
-
disposers.push(commands.register({ name: 'kioku-lisp', description: 'Common Lisp の開始・状態・停止・復旧', input: { hint: 'approval ask|auto|status | enable | enable-task | status [--json] | cancel | recover | abandon ID | restore ID | disable' },
|
|
854
|
+
disposers.push(commands.register({ name: 'kioku-lisp', description: 'Common Lisp の開始・状態・停止・復旧', input: { hint: 'approval ask|auto|status | enable | enable-task | status [--json] | cancel | recover | abandon ID | restore ID | abandon-managed ID 証跡 | disable' },
|
|
830
855
|
handler: async (invocation) => {
|
|
831
856
|
try {
|
|
832
857
|
const binding = owner(invocation.agent);
|
|
833
|
-
const
|
|
834
|
-
|
|
858
|
+
const words = invocation.rawInput.trim().split(/\s+/u).filter(Boolean);
|
|
859
|
+
const [action = 'status', argument, ...extra] = words;
|
|
860
|
+
// Human reconciliation takes an ID plus free-text evidence, so it owns its own shape.
|
|
861
|
+
const managedEvidence = action === 'abandon-managed' ? words.slice(2).join(' ') : '';
|
|
862
|
+
if (action === 'abandon-managed') {
|
|
863
|
+
if (!argument)
|
|
864
|
+
fail('INVALID_COMMAND', '使い方: /kioku-lisp abandon-managed 操作ID 照合した内容');
|
|
865
|
+
}
|
|
866
|
+
else if (extra.length || (argument && !['approval', 'status', 'hot', 'diagnostics', 'abandon', 'restore'].includes(action)))
|
|
835
867
|
fail('INVALID_COMMAND', '使い方: /kioku-lisp enable|enable-task|status|hot [NAME]|diagnostics|cancel|recover|abandon ID|restore ID|disable');
|
|
836
868
|
let result;
|
|
837
869
|
if (action === 'approval') {
|
|
@@ -884,6 +916,8 @@ export async function mountLispSurface(ctx, runtime, config, skillPrompts, decis
|
|
|
884
916
|
}
|
|
885
917
|
else if (action === 'abandon')
|
|
886
918
|
result = await manager.abandon(binding.owner, argument ?? '');
|
|
919
|
+
else if (action === 'abandon-managed')
|
|
920
|
+
result = await manager.abandonManaged(binding.owner, argument ?? '', managedEvidence);
|
|
887
921
|
else if (action === 'restore')
|
|
888
922
|
result = await manager.restore(binding.owner, argument ?? '', invocation.signal);
|
|
889
923
|
else if (action === 'diagnostics')
|