kiokuko-dsh 0.2.0 → 0.2.2
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/PERMISSIONS.md +21 -28
- package/README.ja.md +5 -2
- package/README.md +8 -2
- package/THIRD_PARTY_NOTICES.md +8 -0
- package/dist/client.cjs +2248 -1383
- package/dist/client.d.ts +3 -1
- package/dist/client.d.ts.map +1 -1
- package/dist/deep-thinker/configuration.d.ts.map +1 -1
- package/dist/deep-thinker/configuration.js +8 -5
- package/dist/deep-thinker/configuration.js.map +1 -1
- package/dist/deep-thinker/core/contracts.d.ts +107 -13
- package/dist/deep-thinker/core/contracts.d.ts.map +1 -1
- package/dist/deep-thinker/core/contracts.js +4 -2
- package/dist/deep-thinker/core/contracts.js.map +1 -1
- package/dist/deep-thinker/memory-finalizer.d.ts +10 -10
- package/dist/deep-thinker/memory-finalizer.js +2 -2
- package/dist/deep-thinker/memory-finalizer.js.map +1 -1
- package/dist/deep-thinker/report.d.ts +1 -1
- package/dist/deep-thinker/store.d.ts +10 -10
- package/dist/deep-thinker/store.d.ts.map +1 -1
- package/dist/deep-thinker/store.js +2 -2
- package/dist/deep-thinker/store.js.map +1 -1
- package/dist/dsh/agenticreplay-read-service.d.ts.map +1 -1
- package/dist/dsh/agenticreplay-read-service.js +2 -1
- package/dist/dsh/agenticreplay-read-service.js.map +1 -1
- package/dist/dsh/agenticreplay-security.d.ts +2 -0
- package/dist/dsh/agenticreplay-security.d.ts.map +1 -1
- package/dist/dsh/agenticreplay-security.js +67 -0
- package/dist/dsh/agenticreplay-security.js.map +1 -1
- package/dist/dsh/completion-verifiers.d.ts +26 -0
- package/dist/dsh/completion-verifiers.d.ts.map +1 -0
- package/dist/dsh/completion-verifiers.js +9 -0
- package/dist/dsh/completion-verifiers.js.map +1 -0
- package/dist/dsh/config.d.ts +5 -1
- package/dist/dsh/config.d.ts.map +1 -1
- package/dist/dsh/core/host.d.ts +1 -1
- package/dist/dsh/core/host.d.ts.map +1 -1
- package/dist/dsh/core/host.js +49 -4
- package/dist/dsh/core/host.js.map +1 -1
- package/dist/dsh/core/index.d.ts +4 -4
- package/dist/dsh/core/tasks.d.ts.map +1 -1
- package/dist/dsh/core/tasks.js +7 -0
- package/dist/dsh/core/tasks.js.map +1 -1
- package/dist/dsh/core-runtime.d.ts +1 -0
- package/dist/dsh/core-runtime.d.ts.map +1 -1
- package/dist/dsh/core-runtime.js +4 -1
- package/dist/dsh/core-runtime.js.map +1 -1
- package/dist/dsh/decisions/config.d.ts +2 -2
- package/dist/dsh/enno-delegation.js +2 -2
- package/dist/dsh/enno-delegation.js.map +1 -1
- package/dist/dsh/execution-command.d.ts +4 -0
- package/dist/dsh/execution-command.d.ts.map +1 -0
- package/dist/dsh/execution-command.js +52 -0
- package/dist/dsh/execution-command.js.map +1 -0
- package/dist/dsh/execution-journal.d.ts +17 -0
- package/dist/dsh/execution-journal.d.ts.map +1 -0
- package/dist/dsh/execution-journal.js +69 -0
- package/dist/dsh/execution-journal.js.map +1 -0
- package/dist/dsh/execution-result.d.ts +20 -0
- package/dist/dsh/execution-result.d.ts.map +1 -0
- package/dist/dsh/execution-result.js +7 -0
- package/dist/dsh/execution-result.js.map +1 -0
- package/dist/dsh/execution-selection.d.ts +149 -22
- package/dist/dsh/execution-selection.d.ts.map +1 -1
- package/dist/dsh/execution-selection.js +18 -6
- package/dist/dsh/execution-selection.js.map +1 -1
- package/dist/dsh/host-adapter/admission.d.ts.map +1 -1
- package/dist/dsh/host-adapter/admission.js +20 -0
- package/dist/dsh/host-adapter/admission.js.map +1 -1
- package/dist/dsh/host-adapter/turn-state.js +1 -1
- package/dist/dsh/host-adapter/turn-state.js.map +1 -1
- package/dist/dsh/host-adapter.d.ts.map +1 -1
- package/dist/dsh/host-adapter.js +26 -13
- package/dist/dsh/host-adapter.js.map +1 -1
- package/dist/dsh/index.d.ts +4 -2
- package/dist/dsh/index.d.ts.map +1 -1
- package/dist/dsh/index.js +7 -0
- package/dist/dsh/index.js.map +1 -1
- package/dist/dsh/intake-gate.d.ts +1 -0
- package/dist/dsh/intake-gate.d.ts.map +1 -1
- package/dist/dsh/intake-gate.js +9 -1
- package/dist/dsh/intake-gate.js.map +1 -1
- package/dist/dsh/lisp/approval.d.ts +2 -1
- package/dist/dsh/lisp/approval.d.ts.map +1 -1
- package/dist/dsh/lisp/approval.js +4 -3
- package/dist/dsh/lisp/approval.js.map +1 -1
- package/dist/dsh/lisp/candidate.d.ts +3 -3
- package/dist/dsh/lisp/code-intelligence-contracts.d.ts +78 -0
- package/dist/dsh/lisp/code-intelligence-contracts.d.ts.map +1 -0
- package/dist/dsh/lisp/code-intelligence-contracts.js +54 -0
- package/dist/dsh/lisp/code-intelligence-contracts.js.map +1 -0
- package/dist/dsh/lisp/code-intelligence-provider.d.ts +116 -0
- package/dist/dsh/lisp/code-intelligence.d.ts +13 -0
- package/dist/dsh/lisp/code-intelligence.d.ts.map +1 -0
- package/dist/dsh/lisp/code-intelligence.js +181 -0
- package/dist/dsh/lisp/code-intelligence.js.map +1 -0
- package/dist/dsh/lisp/coding-choice.d.ts +1 -0
- package/dist/dsh/lisp/coding-choice.d.ts.map +1 -1
- package/dist/dsh/lisp/coding-choice.js +17 -6
- package/dist/dsh/lisp/coding-choice.js.map +1 -1
- package/dist/dsh/lisp/compiled-cache.d.ts.map +1 -1
- package/dist/dsh/lisp/compiled-cache.js +3 -2
- package/dist/dsh/lisp/compiled-cache.js.map +1 -1
- package/dist/dsh/lisp/contracts.d.ts +4 -0
- package/dist/dsh/lisp/contracts.d.ts.map +1 -1
- package/dist/dsh/lisp/contracts.js +1 -0
- package/dist/dsh/lisp/contracts.js.map +1 -1
- package/dist/dsh/lisp/manager.d.ts +8 -1
- package/dist/dsh/lisp/manager.d.ts.map +1 -1
- package/dist/dsh/lisp/manager.js +78 -24
- package/dist/dsh/lisp/manager.js.map +1 -1
- package/dist/dsh/lisp/model-result.d.ts.map +1 -1
- package/dist/dsh/lisp/model-result.js +35 -1
- package/dist/dsh/lisp/model-result.js.map +1 -1
- package/dist/dsh/lisp/proposal-batch.d.ts +2 -0
- package/dist/dsh/lisp/proposal-batch.d.ts.map +1 -1
- package/dist/dsh/lisp/proposal-batch.js +32 -2
- package/dist/dsh/lisp/proposal-batch.js.map +1 -1
- package/dist/dsh/lisp/sandbox.d.ts +3 -0
- package/dist/dsh/lisp/sandbox.d.ts.map +1 -1
- package/dist/dsh/lisp/sandbox.js +13 -6
- package/dist/dsh/lisp/sandbox.js.map +1 -1
- package/dist/dsh/lisp/surface.d.ts +1 -1
- package/dist/dsh/lisp/surface.d.ts.map +1 -1
- package/dist/dsh/lisp/surface.js +74 -20
- package/dist/dsh/lisp/surface.js.map +1 -1
- package/dist/dsh/lisp/worker.d.ts +2 -0
- package/dist/dsh/lisp/worker.d.ts.map +1 -1
- package/dist/dsh/lisp/worker.js +7 -5
- package/dist/dsh/lisp/worker.js.map +1 -1
- package/dist/dsh/memory-application.d.ts +1 -1
- package/dist/dsh/memory-application.d.ts.map +1 -1
- package/dist/dsh/memory-application.js +4 -3
- package/dist/dsh/memory-application.js.map +1 -1
- package/dist/dsh/model-auto/candidates.d.ts.map +1 -1
- package/dist/dsh/model-auto/candidates.js +31 -22
- package/dist/dsh/model-auto/candidates.js.map +1 -1
- package/dist/dsh/model-configuration.d.ts +145 -2
- package/dist/dsh/model-configuration.d.ts.map +1 -1
- package/dist/dsh/model-configuration.js +10 -3
- package/dist/dsh/model-configuration.js.map +1 -1
- package/dist/dsh/model-selection-ui.d.ts.map +1 -1
- package/dist/dsh/model-selection-ui.js +7 -2
- package/dist/dsh/model-selection-ui.js.map +1 -1
- package/dist/dsh/models/config-store.d.ts +8 -0
- package/dist/dsh/models/config-store.d.ts.map +1 -0
- package/dist/dsh/models/config-store.js +49 -0
- package/dist/dsh/models/config-store.js.map +1 -0
- package/dist/dsh/models/contracts.d.ts +107 -0
- package/dist/dsh/models/contracts.d.ts.map +1 -0
- package/dist/dsh/models/contracts.js +104 -0
- package/dist/dsh/models/contracts.js.map +1 -0
- package/dist/dsh/models/metadata.d.ts +7 -0
- package/dist/dsh/models/metadata.d.ts.map +1 -0
- package/dist/dsh/models/metadata.js +13 -0
- package/dist/dsh/models/metadata.js.map +1 -0
- package/dist/dsh/models/profiles.d.ts +10 -0
- package/dist/dsh/models/profiles.d.ts.map +1 -0
- package/dist/dsh/models/profiles.js +176 -0
- package/dist/dsh/models/profiles.js.map +1 -0
- package/dist/dsh/models/service.d.ts +97 -0
- package/dist/dsh/models/service.d.ts.map +1 -0
- package/dist/dsh/models/service.js +518 -0
- package/dist/dsh/models/service.js.map +1 -0
- package/dist/dsh/models/surface.d.ts +8 -0
- package/dist/dsh/models/surface.d.ts.map +1 -0
- package/dist/dsh/models/surface.js +162 -0
- package/dist/dsh/models/surface.js.map +1 -0
- package/dist/dsh/models/vendor/THIRD_PARTY_NOTICES.txt +134 -0
- package/dist/dsh/models/vendor/abortable.d.ts +3 -0
- package/dist/dsh/models/vendor/abortable.d.ts.map +1 -0
- package/dist/dsh/models/vendor/abortable.js +10 -0
- package/dist/dsh/models/vendor/abortable.js.map +1 -0
- package/dist/dsh/models/vendor/auth-contract.d.ts +67 -0
- package/dist/dsh/models/vendor/auth-contract.d.ts.map +1 -0
- package/dist/dsh/models/vendor/auth-contract.js +2 -0
- package/dist/dsh/models/vendor/auth-contract.js.map +1 -0
- package/dist/dsh/models/vendor/credentials.d.ts +58 -0
- package/dist/dsh/models/vendor/credentials.d.ts.map +1 -0
- package/dist/dsh/models/vendor/credentials.js +205 -0
- package/dist/dsh/models/vendor/credentials.js.map +1 -0
- package/dist/dsh/models/vendor/nous-oauth.d.ts +6 -0
- package/dist/dsh/models/vendor/nous-oauth.d.ts.map +1 -0
- package/dist/dsh/models/vendor/nous-oauth.js +113 -0
- package/dist/dsh/models/vendor/nous-oauth.js.map +1 -0
- package/dist/dsh/models/vendor/opencode-adapter.d.ts +38 -0
- package/dist/dsh/models/vendor/opencode-adapter.d.ts.map +1 -0
- package/dist/dsh/models/vendor/opencode-adapter.js +207 -0
- package/dist/dsh/models/vendor/opencode-adapter.js.map +1 -0
- package/dist/dsh/models/vendor/opencode-catalog.d.ts +73 -0
- package/dist/dsh/models/vendor/opencode-catalog.d.ts.map +1 -0
- package/dist/dsh/models/vendor/opencode-catalog.js +253 -0
- package/dist/dsh/models/vendor/opencode-catalog.js.map +1 -0
- package/dist/dsh/models/vendor/opencode-codec.d.ts +7 -0
- package/dist/dsh/models/vendor/opencode-codec.d.ts.map +1 -0
- package/dist/dsh/models/vendor/opencode-codec.js +107 -0
- package/dist/dsh/models/vendor/opencode-codec.js.map +1 -0
- package/dist/dsh/models/vendor/opencode-owned.generated.d.ts +114 -0
- package/dist/dsh/models/vendor/opencode-owned.generated.d.ts.map +1 -0
- package/dist/dsh/models/vendor/opencode-owned.generated.js +2867 -0
- package/dist/dsh/models/vendor/opencode-owned.generated.js.map +1 -0
- package/dist/dsh/models/vendor/opencode-replay.d.ts +17 -0
- package/dist/dsh/models/vendor/opencode-replay.d.ts.map +1 -0
- package/dist/dsh/models/vendor/opencode-replay.js +147 -0
- package/dist/dsh/models/vendor/opencode-replay.js.map +1 -0
- package/dist/dsh/models/vendor/opencode-sdk.d.ts +6 -0
- package/dist/dsh/models/vendor/opencode-sdk.d.ts.map +1 -0
- package/dist/dsh/models/vendor/opencode-sdk.js +49915 -0
- package/dist/dsh/models/vendor/opencode-sdk.js.map +7 -0
- package/dist/dsh/models/vendor/opencode-transport.d.ts +6 -0
- package/dist/dsh/models/vendor/opencode-transport.d.ts.map +1 -0
- package/dist/dsh/models/vendor/opencode-transport.js +70 -0
- package/dist/dsh/models/vendor/opencode-transport.js.map +1 -0
- package/dist/dsh/models/vendor/pi-ai.d.ts +23 -0
- package/dist/dsh/models/vendor/pi-ai.d.ts.map +1 -0
- package/dist/dsh/models/vendor/pi-ai.js +27 -0
- package/dist/dsh/models/vendor/pi-ai.js.map +1 -0
- package/dist/dsh/modules/lisp.d.ts +1 -1
- package/dist/dsh/modules/lisp.d.ts.map +1 -1
- package/dist/dsh/modules/lisp.js +1 -1
- package/dist/dsh/modules/lisp.js.map +1 -1
- package/dist/dsh/native-model-catalog.d.ts.map +1 -1
- package/dist/dsh/native-model-catalog.js +4 -3
- package/dist/dsh/native-model-catalog.js.map +1 -1
- package/dist/dsh/node-tap-summary.d.ts +6 -1
- package/dist/dsh/node-tap-summary.d.ts.map +1 -1
- package/dist/dsh/node-tap-summary.js +27 -2
- package/dist/dsh/node-tap-summary.js.map +1 -1
- package/dist/dsh/on-demand-intake.d.ts +1 -1
- package/dist/dsh/on-demand-intake.d.ts.map +1 -1
- package/dist/dsh/on-demand-intake.js +24 -12
- package/dist/dsh/on-demand-intake.js.map +1 -1
- package/dist/dsh/owned-evidence.d.ts +49 -0
- package/dist/dsh/owned-evidence.d.ts.map +1 -0
- package/dist/dsh/owned-evidence.js +69 -0
- package/dist/dsh/owned-evidence.js.map +1 -0
- package/dist/dsh/owned-execution.d.ts +98 -0
- package/dist/dsh/owned-execution.d.ts.map +1 -0
- package/dist/dsh/owned-execution.js +523 -0
- package/dist/dsh/owned-execution.js.map +1 -0
- package/dist/dsh/plan-transition.d.ts +5 -0
- package/dist/dsh/plan-transition.d.ts.map +1 -0
- package/dist/dsh/plan-transition.js +34 -0
- package/dist/dsh/plan-transition.js.map +1 -0
- package/dist/dsh/session-memory-finalizer.d.ts.map +1 -1
- package/dist/dsh/session-memory-finalizer.js +46 -3
- package/dist/dsh/session-memory-finalizer.js.map +1 -1
- package/dist/dsh/setup.d.ts +1 -1
- package/dist/dsh/setup.d.ts.map +1 -1
- package/dist/dsh/setup.js +2 -0
- package/dist/dsh/setup.js.map +1 -1
- package/dist/dsh/skill-prompts.json +1 -1
- package/dist/dsh/task-completion.d.ts +1 -0
- package/dist/dsh/task-completion.d.ts.map +1 -1
- package/dist/dsh/task-completion.js +19 -19
- package/dist/dsh/task-completion.js.map +1 -1
- package/dist/enno-oduno/schemas.d.ts +9 -9
- package/dist/enno-oduno/store.d.ts.map +1 -1
- package/dist/enno-oduno/store.js +12 -0
- package/dist/enno-oduno/store.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/dist/memory/application.d.ts +2 -1
- package/dist/memory/application.d.ts.map +1 -1
- package/dist/memory/application.js +26 -12
- package/dist/memory/application.js.map +1 -1
- package/dist/memory/evidence.d.ts +2 -0
- package/dist/memory/evidence.d.ts.map +1 -1
- package/dist/memory/evidence.js +3 -1
- package/dist/memory/evidence.js.map +1 -1
- package/dist/model-tools/contracts.d.ts +4 -4
- package/dist/models-client.cjs +635 -0
- package/dist/models-client.d.ts +26 -0
- package/dist/models-client.d.ts.map +1 -0
- package/dist/models-client.js +642 -0
- package/dist/models-client.js.map +1 -0
- package/docs/agenticreplay-recording.md +14 -0
- package/docs/code-intelligence.md +149 -0
- package/docs/dsh-auth-LICENSE.txt +22 -0
- package/docs/dsh-auth-provenance.md +25 -0
- package/docs/dsh-plugin.md +21 -0
- package/docs/kiokuko-models.md +66 -0
- package/docs/lisp.md +107 -56
- package/docs/model-selection.ja.md +7 -9
- package/docs/model-selection.md +14 -12
- package/docs/owned-execution.md +99 -0
- package/lisp/supervisor.mjs +8 -2
- package/lisp/tools.lisp +31 -3
- package/migrations/035_owned_execution.sql +19 -0
- package/package.json +46 -11
- package/skills/kiokuko-lisp/SKILL.md +49 -67
- package/skills/kiokuko-soul/SKILL.md +7 -26
|
@@ -90,13 +90,44 @@ function boundedData(value, characters, items, omitted, path) {
|
|
|
90
90
|
return value.slice(0, items).map((item, i) => boundedData(item, characters, items, omitted, `${path}/${i}`));
|
|
91
91
|
}
|
|
92
92
|
if (record(value)) {
|
|
93
|
+
if (value.protocol === 'code-intelligence/v1') {
|
|
94
|
+
const { data, ...metadata } = value;
|
|
95
|
+
return { ...metadata, ...(data !== undefined ? { data: boundedData(data, characters, items, omitted, `${path}/data`) } : {}) };
|
|
96
|
+
}
|
|
93
97
|
const entries = Object.entries(value);
|
|
94
98
|
if (entries.length > items)
|
|
95
99
|
omitted.push(path);
|
|
96
|
-
return Object.fromEntries(entries.
|
|
100
|
+
return Object.fromEntries(entries.filter(([key], index) => index < items || key === 'value' || key === 'json').map(([key, item]) => [key, boundedData(item, characters, items, omitted, `${path}/${key.replaceAll('~', '~0').replaceAll('/', '~1')}`)]));
|
|
97
101
|
}
|
|
98
102
|
return value;
|
|
99
103
|
}
|
|
104
|
+
/** Keep aggregate failures visible even when an array page omits the failed item. */
|
|
105
|
+
function codeOutcomes(value) {
|
|
106
|
+
const pending = [value], seen = new WeakSet(), statuses = Object.create(null), freshness = Object.create(null);
|
|
107
|
+
const versions = new Set();
|
|
108
|
+
let total = 0;
|
|
109
|
+
while (pending.length) {
|
|
110
|
+
const item = pending.pop();
|
|
111
|
+
if (!item || typeof item !== 'object' || seen.has(item))
|
|
112
|
+
continue;
|
|
113
|
+
seen.add(item);
|
|
114
|
+
if (record(item) && item.protocol === 'code-intelligence/v1' && typeof item.status === 'string' && ['ok', 'partial', 'unsupported', 'unavailable', 'stale', 'cancelled', 'timeout', 'limit_exceeded'].includes(item.status)) {
|
|
115
|
+
total++;
|
|
116
|
+
statuses[item.status] = (statuses[item.status] ?? 0) + 1;
|
|
117
|
+
if (typeof item.freshness === 'string' && ['pinned', 'current', 'unknown', 'stale'].includes(item.freshness))
|
|
118
|
+
freshness[item.freshness] = (freshness[item.freshness] ?? 0) + 1;
|
|
119
|
+
if (typeof item.snapshotVersion === 'string')
|
|
120
|
+
versions.add(item.snapshotVersion.slice(0, 256));
|
|
121
|
+
}
|
|
122
|
+
else
|
|
123
|
+
for (const child of Array.isArray(item) ? item : Object.values(item))
|
|
124
|
+
pending.push(child);
|
|
125
|
+
}
|
|
126
|
+
if (!total)
|
|
127
|
+
return;
|
|
128
|
+
const page = [...versions].slice(0, 40);
|
|
129
|
+
return { total, statuses, freshness, snapshotVersions: page, omittedVersions: versions.size - page.length };
|
|
130
|
+
}
|
|
100
131
|
/** Preserve outcome metadata even when source, verifier output or values are large. */
|
|
101
132
|
export function renderResult(value) {
|
|
102
133
|
if (!record(value))
|
|
@@ -108,6 +139,9 @@ export function renderResult(value) {
|
|
|
108
139
|
if (source[key] !== undefined)
|
|
109
140
|
core[key] = source[key];
|
|
110
141
|
}
|
|
142
|
+
const summary = codeOutcomes(source.value);
|
|
143
|
+
if (summary)
|
|
144
|
+
core.codeOutcomes = summary;
|
|
111
145
|
const rest = { ...source };
|
|
112
146
|
for (const key of Object.keys(core))
|
|
113
147
|
delete rest[key];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-result.js","sourceRoot":"","sources":["../../../src/dsh/lisp/model-result.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"model-result.js","sourceRoot":"","sources":["../../../src/dsh/lisp/model-result.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,7 @@ export declare class LispProposalBatch {
|
|
|
21
21
|
protectedRoots: () => string[];
|
|
22
22
|
questions?: DshUserQuestions;
|
|
23
23
|
stopped: () => boolean;
|
|
24
|
+
execute?: (owner: LispOwner, name: string, args: Record<string, unknown>, signal: AbortSignal, callId: string) => Promise<any>;
|
|
24
25
|
};
|
|
25
26
|
constructor(options: {
|
|
26
27
|
store: LispStore;
|
|
@@ -28,6 +29,7 @@ export declare class LispProposalBatch {
|
|
|
28
29
|
protectedRoots: () => string[];
|
|
29
30
|
questions?: DshUserQuestions;
|
|
30
31
|
stopped: () => boolean;
|
|
32
|
+
execute?: (owner: LispOwner, name: string, args: Record<string, unknown>, signal: AbortSignal, callId: string) => Promise<any>;
|
|
31
33
|
});
|
|
32
34
|
apply(owner: LispOwner, evalId: string, generation: string, requests: readonly ProposalInput[], signal: AbortSignal, restoration?: FrozenChange['restoration'], expected?: {
|
|
33
35
|
readSet: FileSnapshot[];
|
|
@@ -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;AAE3C,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,CAAA;KAAE;
|
|
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;AAE3C,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,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;gBADjG,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,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;CAoHtJ"}
|
|
@@ -32,6 +32,34 @@ export class LispProposalBatch {
|
|
|
32
32
|
requests = requests.map(request => ({ ...request }));
|
|
33
33
|
if (!requests.length)
|
|
34
34
|
return [];
|
|
35
|
+
if (this.options.execute) {
|
|
36
|
+
const outcomes = [];
|
|
37
|
+
if (expected)
|
|
38
|
+
for (const before of expected.readSet) {
|
|
39
|
+
if (!sameFile(before, await snapshot(owner.root, before.path.slice(owner.root.length + 1), this.options.protectedRoots())))
|
|
40
|
+
return requests.map((request, index) => ({ id: `${evalId}:${index}`, path: request.path, state: 'NOT_APPLIED', code: 'BASE_CHANGED' }));
|
|
41
|
+
}
|
|
42
|
+
for (const [index, request] of requests.entries()) {
|
|
43
|
+
if (signal.aborted || this.options.stopped())
|
|
44
|
+
break;
|
|
45
|
+
try {
|
|
46
|
+
const before = expected?.targets[request.path];
|
|
47
|
+
const result = await this.options.execute(owner, request.operation === 'delete' ? 'kioku_remove' : 'kioku_write', { path: request.path, ...(request.operation === 'write' ? { content: restoration ? (await restoreBytes(restoration)).toString('utf8') : request.content } : {}), ...(before ? { expectedHash: before.hash ?? null } : {}) }, signal, `lisp-proposal:${evalId}:${index}`);
|
|
48
|
+
const state = result.applied ? 'APPLIED' : result.receipt?.state === 'unknown' ? 'UNKNOWN' : 'NOT_APPLIED';
|
|
49
|
+
outcomes.push({ id: `${evalId}:${index}`, path: request.path, state, ...(result.receipt?.error ? { message: result.receipt.error } : {}) });
|
|
50
|
+
if (state !== 'APPLIED')
|
|
51
|
+
break;
|
|
52
|
+
}
|
|
53
|
+
catch (error) {
|
|
54
|
+
outcomes.push({ id: `${evalId}:${index}`, path: request.path, state: 'UNKNOWN', message: failure(error).message });
|
|
55
|
+
break;
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
for (const [index, request] of requests.entries())
|
|
59
|
+
if (!outcomes.some(outcome => outcome.path === request.path))
|
|
60
|
+
outcomes.push({ id: `${evalId}:${index}`, path: request.path, state: 'NOT_APPLIED', reason: 'batch_stopped' });
|
|
61
|
+
return outcomes;
|
|
62
|
+
}
|
|
35
63
|
const { store, backupRoot } = this.options, roots = this.options.protectedRoots();
|
|
36
64
|
const changes = [], reserved = new Map(), outcomes = [];
|
|
37
65
|
let backupReservation = 0;
|
|
@@ -83,7 +111,9 @@ export class LispProposalBatch {
|
|
|
83
111
|
this.#backupReserved += backupReservation;
|
|
84
112
|
if (await backupUsage(backupRoot) + this.#backupReserved > 1024 ** 3)
|
|
85
113
|
fail('BACKUP_LIMIT', 'バックアップが 1 GiB に達するため変更を適用していません。');
|
|
86
|
-
if (
|
|
114
|
+
if (this.options.questions?.executionMode === 'development'
|
|
115
|
+
? active.some(c => c.request.operation === 'delete' && !/^(?:dist|build|target|node_modules)(?:[/\\]|$)/u.test(c.request.path))
|
|
116
|
+
: active.some(c => c.before.exists || c.request.operation === 'delete' || c.restoration)) {
|
|
87
117
|
const details = [];
|
|
88
118
|
for (const c of active) {
|
|
89
119
|
await store.transition(owner, id(c), ['RUNNING'], 'AWAITING_APPROVAL', { evalId });
|
|
@@ -98,7 +128,7 @@ export class LispProposalBatch {
|
|
|
98
128
|
question: `${active.length}件の確定した変更を適用しますか?`,
|
|
99
129
|
detail: `${details.join('\n\n')}\n\n途中で競合・取消が起きた場合、残りの適用を止めます。適用済みの変更とバックアップは保持します。`,
|
|
100
130
|
options: [{ label: '許可しない' }, { label }], intent: { kind: 'plan-review', approve: label },
|
|
101
|
-
}, signal);
|
|
131
|
+
}, signal, 300000, true);
|
|
102
132
|
if (!approval.approved) {
|
|
103
133
|
for (const c of active)
|
|
104
134
|
await record(c, { id: id(c), path: c.request.path, state: 'NOT_APPLIED', reason: approval.reason, ...(approval.message ? { message: approval.message } : {}) });
|
|
@@ -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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"}
|
|
@@ -5,6 +5,8 @@ export interface SandboxLayout {
|
|
|
5
5
|
cache: string;
|
|
6
6
|
library: string;
|
|
7
7
|
compiled?: string;
|
|
8
|
+
workspace?: string;
|
|
9
|
+
protected?: boolean;
|
|
8
10
|
}
|
|
9
11
|
export interface Launch {
|
|
10
12
|
command: string;
|
|
@@ -12,6 +14,7 @@ export interface Launch {
|
|
|
12
14
|
env: NodeJS.ProcessEnv;
|
|
13
15
|
cwd: string;
|
|
14
16
|
seccompPath?: string;
|
|
17
|
+
group?: boolean;
|
|
15
18
|
}
|
|
16
19
|
export declare function executable(name: string): Promise<string>;
|
|
17
20
|
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,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,CAAA;CAAE;AAEvI,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,CAIzF;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
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { access, mkdir, realpath, stat, writeFile } from 'node:fs/promises';
|
|
2
2
|
import { constants } from 'node:fs';
|
|
3
|
-
import { basename, dirname, isAbsolute, join } from 'node:path';
|
|
3
|
+
import { basename, delimiter, dirname, isAbsolute, join } from 'node:path';
|
|
4
4
|
import { fail } from './contracts.js';
|
|
5
5
|
import { networkFilter } from './seccomp.js';
|
|
6
6
|
import { checkedDirectory } from './files.js';
|
|
@@ -8,7 +8,7 @@ const systemPaths = ['/opt/homebrew/bin', '/usr/local/bin', '/usr/bin', '/bin'];
|
|
|
8
8
|
export async function executable(name) {
|
|
9
9
|
if (/\p{Cc}/u.test(name))
|
|
10
10
|
fail('INVALID_EXECUTABLE', '実行ファイル名が不正です。');
|
|
11
|
-
for (const path of isAbsolute(name) ? [name] : systemPaths.map(p => join(p, name))) {
|
|
11
|
+
for (const path of isAbsolute(name) ? [name] : (process.env.PATH ?? systemPaths.join(delimiter)).split(delimiter).map(p => join(p, name))) {
|
|
12
12
|
try {
|
|
13
13
|
await access(path, constants.X_OK);
|
|
14
14
|
const resolved = await realpath(path);
|
|
@@ -32,12 +32,19 @@ export async function prepareLayout(base, library) {
|
|
|
32
32
|
}
|
|
33
33
|
/** The OS boundary applies to arbitrary Lisp, FFI, exec, Python and shell alike. */
|
|
34
34
|
export async function sandboxLaunch(layout, program, args, generation, protocol = false, directory = '.') {
|
|
35
|
-
|
|
35
|
+
// The broker's Node is the running host runtime, including version-manager
|
|
36
|
+
// and CI tool-cache installs. A caller-controlled PATH cannot replace it.
|
|
37
|
+
const hostNode = await realpath(process.execPath);
|
|
38
|
+
const binary = await executable(layout.protected && program === 'node' ? hostNode : program);
|
|
39
|
+
if (!layout.protected) {
|
|
40
|
+
const cwd = await realpath(directory === '.' ? (layout.workspace ?? layout.scratch) : isAbsolute(directory) ? directory : join(layout.workspace ?? layout.scratch, directory));
|
|
41
|
+
return { command: binary, args, group: true, env: { ...process.env, KIOKU_SCRATCH: `${layout.scratch}/`, KIOKU_CACHE: `${layout.cache}/`, KIOKU_GENERATION: generation, KIOKU_EXECUTION_MODE: 'development', ...(layout.compiled ? { KIOKU_COMPILED: `${layout.compiled}/` } : {}) }, cwd };
|
|
42
|
+
}
|
|
36
43
|
const cwd = (await checkedDirectory(layout.scratch, directory)).path;
|
|
37
|
-
if (!protocol && !['/usr/', '/bin/', '/opt/homebrew/Cellar/', '/opt/homebrew/bin/'].some(root => binary.startsWith(root)))
|
|
44
|
+
if (!protocol && binary !== hostNode && !['/usr/', '/bin/', '/opt/homebrew/Cellar/', '/opt/homebrew/bin/'].some(root => binary.startsWith(root)))
|
|
38
45
|
fail('EXECUTABLE_SCOPE', '実行ファイルは OS またはインストール済みランタイムの場所から指定してください。');
|
|
39
|
-
const env = { PATH: systemPaths.join(':'), HOME: layout.scratch, TMPDIR: layout.scratch, LANG: 'C.UTF-8',
|
|
40
|
-
KIOKU_SCRATCH: `${layout.scratch}/`, KIOKU_CACHE: `${layout.cache}/`, KIOKU_GENERATION: generation };
|
|
46
|
+
const env = { PATH: [...new Set([dirname(hostNode), ...systemPaths])].join(':'), HOME: layout.scratch, TMPDIR: layout.scratch, LANG: 'C.UTF-8',
|
|
47
|
+
KIOKU_SCRATCH: `${layout.scratch}/`, KIOKU_CACHE: `${layout.cache}/`, KIOKU_GENERATION: generation, KIOKU_EXECUTION_MODE: 'protected' };
|
|
41
48
|
if (layout.compiled)
|
|
42
49
|
env.KIOKU_COMPILED = `${layout.compiled}/`;
|
|
43
50
|
// Homebrew Node otherwise reads host OpenSSL configuration outside its
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sandbox.js","sourceRoot":"","sources":["../../../src/dsh/lisp/sandbox.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AACnC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"sandbox.js","sourceRoot":"","sources":["../../../src/dsh/lisp/sandbox.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,8 +39,8 @@ export declare const ToolInput: z.ZodObject<{
|
|
|
39
39
|
leftRef: z.ZodOptional<z.ZodString>;
|
|
40
40
|
rightRef: z.ZodOptional<z.ZodString>;
|
|
41
41
|
target: z.ZodOptional<z.ZodEnum<{
|
|
42
|
-
package: "package";
|
|
43
42
|
build: "build";
|
|
43
|
+
package: "package";
|
|
44
44
|
test: "test";
|
|
45
45
|
typecheck: "typecheck";
|
|
46
46
|
lisp: "lisp";
|
|
@@ -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":"AAGA,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;AAK1D,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;AAa1C,OAAO,EAAuD,KAAK,iBAAiB,EAAkB,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAkC3I,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,CA0X/R;AAkBD,wBAAgB,cAAc,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAiCrD"}
|
package/dist/dsh/lisp/surface.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { CodeIntelligenceAdapterV1 } from './code-intelligence.js';
|
|
1
2
|
import { mountApprovalPolicy } from './approval-settings.js';
|
|
2
3
|
import { renderHistoryResult } from './model-result.js';
|
|
3
4
|
import { dshTurnRequestId } from '../intake-profile-resolver.js';
|
|
@@ -82,17 +83,45 @@ export async function mountLispSurface(ctx, runtime, config, skillPrompts, decis
|
|
|
82
83
|
bound.sessions.get(agent.session.id) !== realpathSync(agent.session.header.cwd))
|
|
83
84
|
fail('SESSION_MISMATCH', 'Lisp approval session identity changed.');
|
|
84
85
|
});
|
|
85
|
-
const
|
|
86
|
+
const development = config.executionMode === 'development';
|
|
87
|
+
const ownerQuestions = { executionMode: config.executionMode, approvalPolicy, ask: request => {
|
|
86
88
|
approvalPolicy.validate(request.agent.id);
|
|
87
89
|
return questions?.ask({ ...request, agent: agents.get(request.agent.id) }) ?? Promise.reject(new Error('Question UI unavailable'));
|
|
88
90
|
} };
|
|
89
91
|
const databasePath = await runtime.withDatabase(db => db.filePath);
|
|
90
92
|
const store = new LispStore(fn => runtime.withDatabase(db => fn(db)));
|
|
91
93
|
const typesafe = new HttpTypeSafeClient(typeSafeCredentials(ctx));
|
|
92
|
-
|
|
94
|
+
let ownerForOwned;
|
|
95
|
+
const ownedCall = async (owner, name, args, signal, callId) => {
|
|
96
|
+
const agent = agents.get(owner.agentId);
|
|
97
|
+
if (!agent || agent.session.id !== owner.sessionId || sessions.get(owner.sessionId) !== agent.session || realpathSync(agent.session.header.cwd) !== owner.root)
|
|
98
|
+
fail('SESSION_MISMATCH', 'Owned tool caller changed.');
|
|
99
|
+
const binding = ownerForOwned(owner);
|
|
100
|
+
const result = await tools.execute({ callId: callId ?? `lisp-owned-${crypto.randomUUID()}`, name, arguments: args, agent, parent: Symbol('lisp-owned'), signal: signal ? AbortSignal.any([binding.signal, signal]) : binding.signal });
|
|
101
|
+
if (result.isError)
|
|
102
|
+
fail('OWNED_EXECUTION_FAILED', JSON.stringify(result.content));
|
|
103
|
+
return result.value;
|
|
104
|
+
};
|
|
93
105
|
const packageAdapter = createLispPackageAdapter(ownerQuestions);
|
|
94
106
|
const memoryVerification = createLispMemoryVerification(runtime);
|
|
95
107
|
const manager = new LispManager({ store, config,
|
|
108
|
+
codeSession: (binding, context) => {
|
|
109
|
+
const agent = agents.get(binding.agentId);
|
|
110
|
+
if (!agent)
|
|
111
|
+
fail('CODE_STALE_SCOPE', 'Code caller is missing.');
|
|
112
|
+
const agentContext = agent.ctx;
|
|
113
|
+
const assertCurrent = () => {
|
|
114
|
+
const current = ownerForOwned(binding);
|
|
115
|
+
if (fence?.stopped || current.signal.aborted || agents.get(binding.agentId) !== agent || sessions.get(binding.sessionId) !== agent.session || agent.ctx !== agentContext || agent.session.id !== binding.sessionId || realpathSync(agent.session.header.cwd) !== binding.root || context.signal.aborted)
|
|
116
|
+
fail('CODE_STALE_SCOPE', 'Code caller, workspace or scope changed.');
|
|
117
|
+
};
|
|
118
|
+
assertCurrent();
|
|
119
|
+
return new CodeIntelligenceAdapterV1({ owner: binding, workspaceRoot: binding.root, scope: agentContext, context: agentContext, assertCurrent }, () => agentContext.get('codeIntelligence', false));
|
|
120
|
+
},
|
|
121
|
+
toolCatalog: owner => ['lisp_status', 'kioku_read', 'kioku_write', 'kioku_edit', 'kioku_remove', 'kioku_exec', 'kioku_result'].flatMap(name => {
|
|
122
|
+
const tool = tools.get(name, agents.get(owner.agentId));
|
|
123
|
+
return tool ? [{ name, parameters: tool.parameters, adapterVersion: 2 }] : [];
|
|
124
|
+
}),
|
|
96
125
|
...(skillPrompts ? { skillPrompts } : {}),
|
|
97
126
|
dataRoot: join(dirname(databasePath), 'lisp'), protectedRoots: [databasePath, `${databasePath}-wal`, `${databasePath}-shm`],
|
|
98
127
|
...(ownerQuestions ? { questions: ownerQuestions } : {}),
|
|
@@ -107,7 +136,15 @@ export async function mountLispSurface(ctx, runtime, config, skillPrompts, decis
|
|
|
107
136
|
return result;
|
|
108
137
|
},
|
|
109
138
|
ciCall: async (owner, request, signal, scratchRoot) => {
|
|
110
|
-
|
|
139
|
+
if (!development) {
|
|
140
|
+
await memoryVerification.beforeCall(owner, request);
|
|
141
|
+
return createLispCiAdapter(ownerQuestions)(owner, request, signal, scratchRoot);
|
|
142
|
+
}
|
|
143
|
+
const ciAdapter = createLispCiAdapter(ownerQuestions, async (file, args, options) => {
|
|
144
|
+
const quote = (value) => "'" + value.replaceAll("'", "'\\''") + "'";
|
|
145
|
+
const value = await ownedCall(owner, 'kioku_exec', { command: [file, ...args].map(quote).join(' '), cwd: options.cwd, timeoutMs: options.timeoutMs }, options.signal);
|
|
146
|
+
return { code: value.exitCode ?? 1, stdout: value.output ?? '', stderr: '', receipt: value.receipt };
|
|
147
|
+
});
|
|
111
148
|
return ciAdapter(owner, request, signal, scratchRoot);
|
|
112
149
|
},
|
|
113
150
|
verifiedCall: memoryVerification.afterEval,
|
|
@@ -139,11 +176,11 @@ export async function mountLispSurface(ctx, runtime, config, skillPrompts, decis
|
|
|
139
176
|
fail('SESSION_MISMATCH', '添付入力のセッションを確認できません。');
|
|
140
177
|
return attachmentInput(agent.session, agent.ctx.get('attachments', false), path, signal);
|
|
141
178
|
},
|
|
142
|
-
toolCall: async (owner, name, args) => {
|
|
179
|
+
toolCall: async (owner, name, args, signal, callId) => {
|
|
143
180
|
const agent = agents.get(owner.agentId);
|
|
144
181
|
if (!agent || agent.session.id !== owner.sessionId || sessions.get(owner.sessionId) !== agent.session || realpathSync(agent.session.header.cwd) !== owner.root)
|
|
145
182
|
fail('SESSION_MISMATCH', 'ホスト呼び出しの主体を確認できません。');
|
|
146
|
-
return tools.execute({ callId: `lisp-host-${crypto.randomUUID()}`, name, arguments: args, agent, parent: Symbol('lisp-host-read'), signal: new AbortController().signal });
|
|
183
|
+
return development ? ownedCall(owner, name, args, signal, callId) : tools.execute({ callId: `lisp-host-${crypto.randomUUID()}`, name, arguments: args, agent, parent: Symbol('lisp-host-read'), signal: signal ?? new AbortController().signal });
|
|
147
184
|
},
|
|
148
185
|
// The independent Web/command surface displays failures. Do not inject a
|
|
149
186
|
// synthetic user request: it could start intake or a fresh model turn.
|
|
@@ -165,15 +202,17 @@ export async function mountLispSurface(ctx, runtime, config, skillPrompts, decis
|
|
|
165
202
|
let hostFence;
|
|
166
203
|
let fence = hostFences ? undefined : root[fenceKey];
|
|
167
204
|
if (!fence) {
|
|
168
|
-
fence = { sessions: new Map(), definitions: new Map(), stopped: true };
|
|
205
|
+
fence = { sessions: new Map(), definitions: new Map(), stopped: true, executionMode: config.executionMode };
|
|
169
206
|
const persistent = fence;
|
|
170
207
|
const check = (execution) => {
|
|
171
208
|
const agent = execution.agent;
|
|
172
209
|
const scope = scopeSession(agent, persistent);
|
|
173
210
|
if (!scope)
|
|
174
211
|
return hostFences || LISP_TOOLS.includes(execution.name) ? 'このセッションでは Lisp が無効または起動中です。' : undefined;
|
|
212
|
+
if (persistent.executionMode === 'development' && !LISP_TOOLS.includes(execution.name))
|
|
213
|
+
return undefined;
|
|
175
214
|
if (persistent.stopped || !persistent.controller)
|
|
176
|
-
return 'Lisp の保護が継続中です。プラグインを戻し /kioku-lisp status で確認してください。';
|
|
215
|
+
return persistent.executionMode === 'development' ? 'Lisp は停止中です。通常ツールは利用できます。' : 'Lisp の保護が継続中です。プラグインを戻し /kioku-lisp status で確認してください。';
|
|
177
216
|
if (!agent || agents.get(agent.id) !== agent || sessions.get(agent.session.id) !== agent.session)
|
|
178
217
|
return 'Lisp のセッションを確認できません。';
|
|
179
218
|
if (agent.session.id !== scope)
|
|
@@ -187,9 +226,18 @@ export async function mountLispSurface(ctx, runtime, config, skillPrompts, decis
|
|
|
187
226
|
const scope = scopeSession(agent, persistent);
|
|
188
227
|
if (!scope)
|
|
189
228
|
return !hostFences;
|
|
229
|
+
if (persistent.executionMode === 'protected') {
|
|
230
|
+
if (persistent.stopped || !persistent.controller || scope !== agent.session.id)
|
|
231
|
+
return false;
|
|
232
|
+
return await persistent.prepareAgent?.(agent) === true;
|
|
233
|
+
}
|
|
190
234
|
if (persistent.stopped || !persistent.controller || scope !== agent.session.id)
|
|
191
|
-
return
|
|
192
|
-
|
|
235
|
+
return true;
|
|
236
|
+
try {
|
|
237
|
+
await persistent.prepareAgent?.(agent);
|
|
238
|
+
}
|
|
239
|
+
catch { /* Lisp diagnostics remain available; ordinary tools proceed. */ }
|
|
240
|
+
return true;
|
|
193
241
|
};
|
|
194
242
|
if (hostFences)
|
|
195
243
|
hostFence = hostFences.attach({ id: 'kiokuko.lisp.v1', tools: LISP_TOOLS, check, beforeStep: prepare });
|
|
@@ -206,6 +254,7 @@ export async function mountLispSurface(ctx, runtime, config, skillPrompts, decis
|
|
|
206
254
|
fence.sessions.set(saved.session_id, saved.root_path);
|
|
207
255
|
}
|
|
208
256
|
await manager.start();
|
|
257
|
+
fence.executionMode = config.executionMode;
|
|
209
258
|
fence.sessions = manager.enabled;
|
|
210
259
|
fence.controller = manager;
|
|
211
260
|
fence.stopped = false;
|
|
@@ -234,9 +283,11 @@ export async function mountLispSurface(ctx, runtime, config, skillPrompts, decis
|
|
|
234
283
|
}
|
|
235
284
|
return { agent, owner: { sessionId: identifier.parse(agent.session.id), agentId: identifier.parse(agent.id), root: realpathSync(agent.session.header.cwd) }, signal: binding.abort.signal };
|
|
236
285
|
};
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
286
|
+
ownerForOwned = (binding) => owner(agents.get(binding.agentId));
|
|
287
|
+
const approvalText = () => `Lisp execution mode: ${config.executionMode}; approval mode: ${approvalPolicy.mode()} (entire profile). ` + (!development
|
|
288
|
+
? 'Explicit protected compatibility mode uses its existing sandbox and approval policy. Native development tools remain independently available. ' + (approvalPolicy.mode() === 'auto' ? 'Do not ask permission to submit, resubmit, run verification or apply changes already covered by auto policy.' : '') : approvalPolicy.mode() === 'auto'
|
|
289
|
+
? 'Routine Lisp/project development is authorized. Source/data deletion and durable user DB mutation still require concrete confirmation. Cancellation, refusal and unknown outcomes remain authoritative.'
|
|
290
|
+
: 'Routine Lisp/project development and verification are authorized without a dialog. Source/data deletion and durable user DB mutation require concrete confirmation. This legacy setting does not restrict ordinary tools.');
|
|
240
291
|
// Native DSH assembles prompts BEFORE agent/pre-step. Register a live provider
|
|
241
292
|
// now so activation, restored sessions and the next step see the current mode.
|
|
242
293
|
const policyPrompt = ctx.get('systemPrompt', false);
|
|
@@ -274,7 +325,8 @@ export async function mountLispSurface(ctx, runtime, config, skillPrompts, decis
|
|
|
274
325
|
agentDisposers.set(agent.id, local);
|
|
275
326
|
const scopedTools = agent.ctx.get('tools');
|
|
276
327
|
// Do not depend on arbitrary third-party PTC runtimes enforcing our boundary.
|
|
277
|
-
|
|
328
|
+
if (scopedTools.modeFor?.(agent) !== 'native')
|
|
329
|
+
local.push(scopedTools.presentAs('native'));
|
|
278
330
|
// Retain the host's existing read and memory-review capabilities, including agent-local preset
|
|
279
331
|
// tools. Pin their implementations so a later same-name registration cannot
|
|
280
332
|
// acquire permission. Dispatch still traverses every native DSH policy/guard.
|
|
@@ -286,13 +338,18 @@ export async function mountLispSurface(ctx, runtime, config, skillPrompts, decis
|
|
|
286
338
|
nativeTools.push(name);
|
|
287
339
|
}
|
|
288
340
|
}
|
|
289
|
-
|
|
341
|
+
if (!development)
|
|
342
|
+
local.push(restrictInheritedTools(tools, scopedTools, agent, nativeTools));
|
|
343
|
+
// Lisp and owned/native tools coexist. A worker failure does not restrict
|
|
344
|
+
// the inherited development surface.
|
|
290
345
|
for (const name of LISP_TOOLS) {
|
|
291
346
|
const definition = { name, get description() { return `${description(name)} Current Lisp approval mode: ${approvalPolicy.mode()} (profile).`; }, modelFacing: true,
|
|
292
347
|
parameters: lispToolSchema(name), output: { schema: {}, render: (_, result) => [{ type: 'text', text: renderResult(result) }] },
|
|
293
348
|
execute: async (args, execution) => {
|
|
294
349
|
try {
|
|
295
350
|
const binding = owner(execution.agent), parsed = ToolInput.parse(args);
|
|
351
|
+
if (development && ctx.get('planMode', false)?.get(binding.agent)?.active && !['lisp_status', 'lisp_hot_status', 'lisp_inspect', 'lisp_cancel'].includes(name))
|
|
352
|
+
fail('PLAN_ACTIVE', 'Plan 中の Lisp 実行・変更はできません。実装指示またはPlan承認後に実行してください。');
|
|
296
353
|
if (name === 'lisp_cancel' && !await manager.isTaskMode(binding.owner)) {
|
|
297
354
|
identifier.parse(parsed.operationId);
|
|
298
355
|
identifier.parse(parsed.generation);
|
|
@@ -384,7 +441,7 @@ export async function mountLispSurface(ctx, runtime, config, skillPrompts, decis
|
|
|
384
441
|
}
|
|
385
442
|
};
|
|
386
443
|
if (config.enabled)
|
|
387
|
-
disposers.push(ctx.provide(LISP_CODING_SERVICE, createLispCodingChoice({
|
|
444
|
+
disposers.push(ctx.provide(LISP_CODING_SERVICE, createLispCodingChoice({ optional: development,
|
|
388
445
|
...(questions ? { questions } : {}),
|
|
389
446
|
enabled: candidate => manager.enabled.has(owner(candidate).owner.sessionId),
|
|
390
447
|
decided: async (candidate) => {
|
|
@@ -409,10 +466,7 @@ export async function mountLispSurface(ctx, runtime, config, skillPrompts, decis
|
|
|
409
466
|
// Native DSH snapshots providers before its assembly waterfall. Admission
|
|
410
467
|
// can activate Lisp inside that waterfall: refresh this request, not only
|
|
411
468
|
// the next one. Use native visibility plus the exact guarded definitions.
|
|
412
|
-
const schemas = tools.schemas(binding.agent).filter(schema => {
|
|
413
|
-
const registered = fence.definitions.get(`${candidate.id}:${schema.name}`);
|
|
414
|
-
return registered && tools.get(schema.name, binding.agent)?.execute === registered.execute;
|
|
415
|
-
});
|
|
469
|
+
const schemas = tools.schemas(binding.agent).filter(schema => development || fence.definitions.get(`${candidate.id}:${schema.name}`) === tools.get(schema.name, binding.agent));
|
|
416
470
|
if (!LISP_TOOLS.every(name => schemas.some(schema => schema.name === name)))
|
|
417
471
|
fail('HOST_CAPABILITY_MISSING', 'Lisp のツール定義を要求へ反映できません。');
|
|
418
472
|
const sections = assembly.sections.filter(section => section.name !== 'kiokuko:lisp');
|
|
@@ -510,7 +564,7 @@ export async function mountLispSurface(ctx, runtime, config, skillPrompts, decis
|
|
|
510
564
|
function description(name) {
|
|
511
565
|
return ({ lisp_eval: 'Evaluate Common Lisp. In persistent mode, define and reuse cohesive functions in one worker generation; proposals use the current host approval policy. In enable-task mode, each evaluation is a disposable scratch experiment without workspace inputs or proposals. Exact operationId replay never re-evaluates.',
|
|
512
566
|
lisp_hot_contract: 'Authorize immutable schemas through the current host approval policy and finite input/expected cases for a project-shared function. Profile auto-approval or explicit human consent grants approval; model declarations do not. Requires enable-task.',
|
|
513
|
-
lisp_hot_install: 'Validate a candidate against the current approved contract in
|
|
567
|
+
lisp_hot_install: 'Validate a candidate against the current approved contract in workers using the selected execution mode, then atomically select it at expectedRevision. Dependency code is snapshotted. Failed checks preserve the active version.',
|
|
514
568
|
lisp_hot_call: 'Call a project-shared function by name, pinning its active immutable version. Input/result refs remain private to this session and agent. Exact operationId replay never executes again.',
|
|
515
569
|
lisp_hot_status: 'Read project-shared function names, revisions and contract refs; paginate with offset. Supply name to inspect approved checks; contractOffset pages their JSON in 2000 Unicode characters. No worker execution.',
|
|
516
570
|
lisp_hot_deactivate: 'Use the current host approval policy to deactivate a project-shared function at expectedRevision. Existing calls and results remain available; new calls stop.',
|