kiokuko-dsh 0.2.34 → 0.2.37
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 +22 -7
- package/README.ja.md +56 -23
- package/README.ko.md +55 -24
- package/README.md +54 -23
- package/README.zh-CN.md +55 -24
- package/dist/deep-thinker/abortable-stream.d.ts.map +1 -1
- package/dist/deep-thinker/abortable-stream.js +2 -0
- package/dist/deep-thinker/abortable-stream.js.map +1 -1
- package/dist/deep-thinker/core/contracts.d.ts +5 -5
- package/dist/deep-thinker/memory-finalizer.d.ts +1 -1
- package/dist/deep-thinker/store.d.ts +1 -1
- package/dist/dsh/agenticreplay-security.d.ts +1 -0
- package/dist/dsh/agenticreplay-security.d.ts.map +1 -1
- package/dist/dsh/agenticreplay-security.js +1 -1
- package/dist/dsh/agenticreplay-security.js.map +1 -1
- package/dist/dsh/auxiliary-recovery.d.ts +68 -0
- package/dist/dsh/auxiliary-recovery.d.ts.map +1 -0
- package/dist/dsh/auxiliary-recovery.js +218 -0
- package/dist/dsh/auxiliary-recovery.js.map +1 -0
- package/dist/dsh/boundary-worker.js +1 -0
- package/dist/dsh/boundary-worker.js.map +1 -1
- package/dist/dsh/coding-workflow/intent.d.ts.map +1 -1
- package/dist/dsh/coding-workflow/intent.js +2 -0
- package/dist/dsh/coding-workflow/intent.js.map +1 -1
- package/dist/dsh/config.d.ts +16 -2
- package/dist/dsh/config.d.ts.map +1 -1
- package/dist/dsh/core/host.d.ts +14 -0
- package/dist/dsh/core/host.d.ts.map +1 -1
- package/dist/dsh/core/host.js +20 -6
- package/dist/dsh/core/host.js.map +1 -1
- package/dist/dsh/core/index.d.ts +56 -2
- package/dist/dsh/core/index.d.ts.map +1 -1
- package/dist/dsh/core/tasks.d.ts +4 -0
- package/dist/dsh/core/tasks.d.ts.map +1 -1
- package/dist/dsh/core/tasks.js +9 -0
- package/dist/dsh/core/tasks.js.map +1 -1
- package/dist/dsh/core-runtime.d.ts +2 -0
- package/dist/dsh/core-runtime.d.ts.map +1 -1
- package/dist/dsh/core-runtime.js +4 -0
- package/dist/dsh/core-runtime.js.map +1 -1
- package/dist/dsh/decisions/config.d.ts +29 -0
- package/dist/dsh/decisions/config.d.ts.map +1 -1
- package/dist/dsh/decisions/config.js +13 -2
- package/dist/dsh/decisions/config.js.map +1 -1
- package/dist/dsh/decisions/diagnostics.d.ts +30 -8
- package/dist/dsh/decisions/diagnostics.d.ts.map +1 -1
- package/dist/dsh/decisions/diagnostics.js +2 -1
- 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 +25 -6
- package/dist/dsh/decisions/host.js.map +1 -1
- package/dist/dsh/decisions/intent-assessment.d.ts +3 -1
- package/dist/dsh/decisions/intent-assessment.d.ts.map +1 -1
- package/dist/dsh/decisions/intent-assessment.js +1 -1
- package/dist/dsh/decisions/intent-assessment.js.map +1 -1
- package/dist/dsh/decisions/openai.d.ts +27 -0
- package/dist/dsh/decisions/openai.d.ts.map +1 -0
- package/dist/dsh/decisions/openai.js +107 -0
- package/dist/dsh/decisions/openai.js.map +1 -0
- package/dist/dsh/decisions/providers.d.ts +10 -1
- package/dist/dsh/decisions/providers.d.ts.map +1 -1
- package/dist/dsh/decisions/providers.js +2 -2
- package/dist/dsh/decisions/providers.js.map +1 -1
- package/dist/dsh/decisions/request-intent.d.ts +1 -1
- package/dist/dsh/decisions/service.d.ts +12 -1
- package/dist/dsh/decisions/service.d.ts.map +1 -1
- package/dist/dsh/decisions/service.js +63 -14
- package/dist/dsh/decisions/service.js.map +1 -1
- package/dist/dsh/execution-selection.d.ts +5 -5
- package/dist/dsh/host-adapter/routing.d.ts.map +1 -1
- package/dist/dsh/host-adapter/routing.js +8 -3
- package/dist/dsh/host-adapter/routing.js.map +1 -1
- package/dist/dsh/host-adapter/session-access.d.ts +2 -0
- package/dist/dsh/host-adapter/session-access.d.ts.map +1 -1
- package/dist/dsh/host-adapter/session-access.js +2 -0
- package/dist/dsh/host-adapter/session-access.js.map +1 -1
- package/dist/dsh/host-adapter.d.ts.map +1 -1
- package/dist/dsh/host-adapter.js +11 -3
- package/dist/dsh/host-adapter.js.map +1 -1
- package/dist/dsh/index.d.ts +32 -6
- package/dist/dsh/index.d.ts.map +1 -1
- package/dist/dsh/lisp/code-intelligence-contracts.js +2 -2
- package/dist/dsh/lisp/coding-choice.d.ts +7 -0
- package/dist/dsh/lisp/coding-choice.d.ts.map +1 -1
- package/dist/dsh/lisp/coding-choice.js +2 -0
- package/dist/dsh/lisp/coding-choice.js.map +1 -1
- package/dist/dsh/lisp/coding-preparation.d.ts +6 -1
- package/dist/dsh/lisp/coding-preparation.d.ts.map +1 -1
- package/dist/dsh/lisp/coding-preparation.js +40 -3
- package/dist/dsh/lisp/coding-preparation.js.map +1 -1
- package/dist/dsh/lisp/manager.d.ts +2 -0
- package/dist/dsh/lisp/manager.d.ts.map +1 -1
- package/dist/dsh/lisp/manager.js +74 -14
- package/dist/dsh/lisp/manager.js.map +1 -1
- package/dist/dsh/lisp/store.d.ts.map +1 -1
- package/dist/dsh/lisp/store.js +6 -10
- package/dist/dsh/lisp/store.js.map +1 -1
- package/dist/dsh/lisp/surface.d.ts.map +1 -1
- package/dist/dsh/lisp/surface.js +3 -2
- package/dist/dsh/lisp/surface.js.map +1 -1
- package/dist/dsh/lisp/worker.d.ts +4 -1
- package/dist/dsh/lisp/worker.d.ts.map +1 -1
- package/dist/dsh/lisp/worker.js +56 -6
- package/dist/dsh/lisp/worker.js.map +1 -1
- package/dist/dsh/lisp-config.js +1 -1
- package/dist/dsh/lisp-config.js.map +1 -1
- package/dist/dsh/managed-file-deployment.d.ts.map +1 -1
- package/dist/dsh/managed-file-deployment.js +3 -1
- package/dist/dsh/managed-file-deployment.js.map +1 -1
- package/dist/dsh/model-auto/coordinator.js +1 -1
- package/dist/dsh/model-auto/coordinator.js.map +1 -1
- package/dist/dsh/model-configuration.d.ts +6 -6
- package/dist/dsh/modules/enno.d.ts +1 -1
- package/dist/dsh/on-demand-intake.d.ts +15 -2
- package/dist/dsh/on-demand-intake.d.ts.map +1 -1
- package/dist/dsh/on-demand-intake.js +130 -9
- package/dist/dsh/on-demand-intake.js.map +1 -1
- package/dist/dsh/session-export-analysis.d.ts +20 -0
- package/dist/dsh/session-export-analysis.d.ts.map +1 -0
- package/dist/dsh/session-export-analysis.js +90 -0
- package/dist/dsh/session-export-analysis.js.map +1 -0
- package/dist/dsh/session-log-export.d.ts +1 -0
- package/dist/dsh/session-log-export.d.ts.map +1 -1
- package/dist/dsh/session-log-export.js +19 -3
- package/dist/dsh/session-log-export.js.map +1 -1
- package/dist/dsh/session-log-mirror.d.ts +1 -1
- package/dist/dsh/session-log-mirror.d.ts.map +1 -1
- package/dist/dsh/session-log-mirror.js +5 -2
- package/dist/dsh/session-log-mirror.js.map +1 -1
- package/dist/dsh/setup.d.ts +22 -0
- package/dist/dsh/setup.d.ts.map +1 -1
- package/dist/dsh/setup.js +50 -4
- package/dist/dsh/setup.js.map +1 -1
- package/dist/dsh/skill-prompts.json +1 -1
- package/dist/dsh/standard-skill-deployment.d.ts +12 -1
- package/dist/dsh/standard-skill-deployment.d.ts.map +1 -1
- package/dist/dsh/standard-skill-deployment.js +76 -4
- package/dist/dsh/standard-skill-deployment.js.map +1 -1
- package/dist/dsh/task-startup.d.ts +24 -0
- package/dist/dsh/task-startup.d.ts.map +1 -0
- package/dist/dsh/task-startup.js +126 -0
- package/dist/dsh/task-startup.js.map +1 -0
- package/dist/dsh/tool-exposure-config.d.ts +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/lifecycle.d.ts +1 -1
- package/docs/README.ja.md +1 -0
- package/docs/README.md +1 -0
- package/docs/dsh-plugin.md +42 -14
- package/docs/getting-started.ja.md +2 -0
- package/docs/getting-started.md +2 -0
- package/docs/lisp-hot-tools.md +7 -4
- package/docs/lisp.md +19 -5
- package/docs/model-selection.ja.md +2 -2
- package/docs/model-selection.md +2 -2
- package/docs/store-evidence.md +6 -0
- package/docs/typed-decisions.md +103 -2
- package/docs/typesafe.md +8 -3
- package/docs/verification.md +28 -3
- package/lisp/process-identity.d.mts +2 -0
- package/lisp/process-identity.mjs +34 -0
- package/lisp/repository-owner.d.mts +1 -0
- package/lisp/repository-owner.mjs +58 -0
- package/lisp/supervisor.mjs +19 -2
- package/lisp/tools.lisp +17 -5
- package/migrations/050_auxiliary_recovery.sql +11 -0
- package/package.json +6 -4
- package/scripts/prepare-build.mjs +13 -0
- package/scripts/setup-dsh.mjs +8 -3
- package/skills/kiokuko-lisp/SKILL.md +5 -3
|
@@ -19,6 +19,10 @@ export class LispCodingPreparation {
|
|
|
19
19
|
}
|
|
20
20
|
async prepare(input) {
|
|
21
21
|
const previous = this.current(input.agent);
|
|
22
|
+
if (previous?.task === input.task && previous.choice && ['selected', 'declined', 'reviewed', 'prototype_required'].includes(previous.phase)) {
|
|
23
|
+
await previous.pending;
|
|
24
|
+
return;
|
|
25
|
+
}
|
|
22
26
|
// A resolved provider decision is a positive signal only. Negative, unresolved or
|
|
23
27
|
// unavailable decisions keep the deterministic detector and never replace the request intent.
|
|
24
28
|
const semanticCoding = input.requestIntent?.action === 'change' && input.requestIntent.changeScope === 'implementation';
|
|
@@ -63,7 +67,7 @@ export class LispCodingPreparation {
|
|
|
63
67
|
state.answerRef = selected.answerRef;
|
|
64
68
|
state.phase = selected.choice === 'yes' ? 'selected' : 'declined';
|
|
65
69
|
if (selected.choice === 'yes')
|
|
66
|
-
await this.host.activate(input.agent);
|
|
70
|
+
await this.host.activate(input.agent, input.signal);
|
|
67
71
|
else
|
|
68
72
|
await this.host.deactivate?.(input.agent);
|
|
69
73
|
})();
|
|
@@ -81,6 +85,30 @@ export class LispCodingPreparation {
|
|
|
81
85
|
delete state.pending;
|
|
82
86
|
}
|
|
83
87
|
}
|
|
88
|
+
async selectTask(input, choice, answerRef) {
|
|
89
|
+
input.signal.throwIfAborted();
|
|
90
|
+
const identity = this.host.identity(input.agent);
|
|
91
|
+
const previous = this.current(input.agent);
|
|
92
|
+
if (previous?.task === input.task && previous.answerRef === answerRef && previous.choice === choice
|
|
93
|
+
&& (choice === 'no' || this.host.enabled(input.agent)))
|
|
94
|
+
return;
|
|
95
|
+
const key = createHash('sha256').update(JSON.stringify([identity, input.task, answerRef])).digest('hex');
|
|
96
|
+
const state = { agent: input.agent, ...identity, task: input.task, key, choice, answerRef, protectedWorkflow: false,
|
|
97
|
+
phase: choice === 'yes' ? 'selected' : 'declined', attempts: 0, failures: 0 };
|
|
98
|
+
this.states.set(input.agent, state);
|
|
99
|
+
try {
|
|
100
|
+
if (choice === 'yes')
|
|
101
|
+
await this.host.activate(input.agent, input.signal);
|
|
102
|
+
else
|
|
103
|
+
await this.host.deactivate?.(input.agent);
|
|
104
|
+
}
|
|
105
|
+
catch (error) {
|
|
106
|
+
state.phase = 'unavailable';
|
|
107
|
+
state.reason = error instanceof Error ? error.message : String(error);
|
|
108
|
+
throw error;
|
|
109
|
+
}
|
|
110
|
+
input.signal.throwIfAborted();
|
|
111
|
+
}
|
|
84
112
|
choiceFor(agent, task) {
|
|
85
113
|
const state = this.current(agent);
|
|
86
114
|
return state?.task === task && state.choice && state.answerRef ? { choice: state.choice, answerRef: state.answerRef } : undefined;
|
|
@@ -115,9 +143,18 @@ export class LispCodingPreparation {
|
|
|
115
143
|
state.failures = 0;
|
|
116
144
|
delete state.operationId;
|
|
117
145
|
}
|
|
118
|
-
|
|
146
|
+
manualOverride(agent) {
|
|
119
147
|
const state = this.current(agent);
|
|
120
|
-
|
|
148
|
+
return state?.choice && state.answerRef?.startsWith('human-command:')
|
|
149
|
+
? { choice: state.choice, answerRef: state.answerRef } : undefined;
|
|
150
|
+
}
|
|
151
|
+
cancelled(agent, task) {
|
|
152
|
+
let state = this.current(agent);
|
|
153
|
+
if (!state || state.task !== task) {
|
|
154
|
+
state = { agent, ...this.host.identity(agent), task, key: randomUUID(), protectedWorkflow: false, phase: 'cancelled', attempts: 0, failures: 0 };
|
|
155
|
+
this.states.set(agent, state);
|
|
156
|
+
}
|
|
157
|
+
else {
|
|
121
158
|
state.key = randomUUID();
|
|
122
159
|
state.phase = 'cancelled';
|
|
123
160
|
delete state.choice;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coding-preparation.js","sourceRoot":"","sources":["../../../src/dsh/lisp/coding-preparation.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"coding-preparation.js","sourceRoot":"","sources":["../../../src/dsh/lisp/coding-preparation.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,6 +53,8 @@ export declare class LispManager {
|
|
|
53
53
|
private stopTaskWorkers;
|
|
54
54
|
/** A managed call uses the same admission queue and OS sandbox as legacy Lisp. */
|
|
55
55
|
private runTask;
|
|
56
|
+
/** Reuse the exact owner's evaluation slot, never another owner's process or heap. */
|
|
57
|
+
private runResidentTask;
|
|
56
58
|
private startWorker;
|
|
57
59
|
/** Serialize only slot allocation/eviction; compilation remains concurrent. */
|
|
58
60
|
private reserveSlot;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../src/dsh/lisp/manager.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAA;AAClE,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAA;AAQlE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,EAA2D,KAAK,iBAAiB,EAAE,KAAK,SAAS,EAAkB,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAC/J,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAEtC,OAAO,EAAc,KAAK,cAAc,EAAY,MAAM,aAAa,CAAA;AAKvE,OAAO,EAAqB,KAAK,aAAa,EAAE,MAAM,SAAS,CAAA;AAC/D,OAAO,EAAE,cAAc,EAAE,KAAK,aAAa,EAAE,MAAM,eAAe,CAAA;AAMlE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAG5D,OAAO,EAAE,iBAAiB,EAA0B,MAAM,qBAAqB,CAAA;AAC/E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;
|
|
1
|
+
{"version":3,"file":"manager.d.ts","sourceRoot":"","sources":["../../../src/dsh/lisp/manager.ts"],"names":[],"mappings":"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"}
|
package/dist/dsh/lisp/manager.js
CHANGED
|
@@ -26,6 +26,7 @@ import { HotToolRuntime } from './hot-tools.js';
|
|
|
26
26
|
import { CallInput, DefineInput, TaskToolCatalog, selectFields, validateValue } from './task-tools.js';
|
|
27
27
|
import { ApplyInput, CompareInput, StageInput, VerifyInput, candidateFromResult, compareCandidates, loadCandidate, loadVerification, materializeCandidate, stageCandidate } from './candidate.js';
|
|
28
28
|
import { LispTaskAuthority } from './task-authority.js';
|
|
29
|
+
import { processIdentity } from '../../../lisp/process-identity.mjs';
|
|
29
30
|
/** Confirm the exact owned operation stopped; an abort acknowledgement is not completion. */
|
|
30
31
|
export async function confirmOwnedJobStop(operationId, read) {
|
|
31
32
|
const abort = new AbortController();
|
|
@@ -71,7 +72,7 @@ export class LispManager {
|
|
|
71
72
|
#taskTools;
|
|
72
73
|
#hot;
|
|
73
74
|
#closed = false;
|
|
74
|
-
#hostId = randomUUID()
|
|
75
|
+
#hostId = `${processIdentity(process.pid) ?? 'unknown'}:${randomUUID()}`;
|
|
75
76
|
#claims = new Set();
|
|
76
77
|
#ownsSessions = false;
|
|
77
78
|
#artifactReserved = 0;
|
|
@@ -95,7 +96,7 @@ export class LispManager {
|
|
|
95
96
|
const state = this.entry(owner);
|
|
96
97
|
if (this.#closed || state.disposed)
|
|
97
98
|
fail('HOST_STOPPED', 'Lisp のホストまたはセッションが停止しています。');
|
|
98
|
-
//
|
|
99
|
+
// A resident worker is reusable only by its exact session/agent owner.
|
|
99
100
|
},
|
|
100
101
|
run: (owner, source, input, signal, mode) => this.runTask(owner, source, input, signal, mode),
|
|
101
102
|
input: (owner, ref) => this.taskResult(owner, ref),
|
|
@@ -112,7 +113,7 @@ export class LispManager {
|
|
|
112
113
|
fail('HOST_LOCK', 'Lisp のホストロックが破損しています。');
|
|
113
114
|
try {
|
|
114
115
|
process.kill(saved.pid, 0);
|
|
115
|
-
fail('HOST_LOCK', '
|
|
116
|
+
fail('HOST_LOCK', '旧形式の Lisp ロックの所有者は PID だけでは確認できません。稼働物とロックを照合してから再開してください。ロックは自動削除しません。');
|
|
116
117
|
}
|
|
117
118
|
catch (check) {
|
|
118
119
|
if (check.code !== 'ESRCH')
|
|
@@ -253,6 +254,13 @@ export class LispManager {
|
|
|
253
254
|
/** A managed call uses the same admission queue and OS sandbox as legacy Lisp. */
|
|
254
255
|
async runTask(owner, code, input, signal, mode = 'call') {
|
|
255
256
|
await this.authorizeCodingTask(owner);
|
|
257
|
+
const repositoryRoot = detectRepositoryRoot({ cwd: owner.root, allowDirectory: true }).root;
|
|
258
|
+
const resident = [...this.#agents.values()].find(s => s.worker && !s.worker.stopped && s.worker.repositoryRoot === repositoryRoot);
|
|
259
|
+
if (resident) {
|
|
260
|
+
if (mode === 'eval' || resident !== this.#agents.get(JSON.stringify([owner.sessionId, owner.agentId])) || resident.owner.root !== owner.root)
|
|
261
|
+
fail('REPOSITORY_IN_USE', 'このリポジトリの Lisp は別の owner が使用中です。状態は保持し、別 SBCL を起動しません。');
|
|
262
|
+
return this.runResidentTask(resident, code, input, signal, mode);
|
|
263
|
+
}
|
|
256
264
|
if ([...this.#agents.values()].some(s => s.owner.sessionId === owner.sessionId && s.state === 'STOP_UNCONFIRMED'))
|
|
257
265
|
fail('STOP_UNCONFIRMED', '停止未確認の Lisp worker があります。新しい実行を開始できません。');
|
|
258
266
|
const abort = new AbortController();
|
|
@@ -350,6 +358,61 @@ export class LispManager {
|
|
|
350
358
|
}
|
|
351
359
|
}
|
|
352
360
|
}
|
|
361
|
+
/** Reuse the exact owner's evaluation slot, never another owner's process or heap. */
|
|
362
|
+
async runResidentTask(state, code, input, signal, mode) {
|
|
363
|
+
const worker = state.worker;
|
|
364
|
+
if (state.state !== 'READY' || !worker.healthy || worker.busy)
|
|
365
|
+
fail(state.state === 'EVALUATING' ? 'BUSY' : 'RECOVERY_REQUIRED', '常駐 Lisp の状態を確認してください。新しい worker は起動しません。');
|
|
366
|
+
signal?.throwIfAborted();
|
|
367
|
+
clearTimeout(state.idleTimer);
|
|
368
|
+
state.state = 'EVALUATING'; // Reserve before awaiting scratch or input I/O.
|
|
369
|
+
state.execution = this.taskAuthority.current();
|
|
370
|
+
const abort = new AbortController();
|
|
371
|
+
state.active.add(abort);
|
|
372
|
+
const combined = signal ? AbortSignal.any([signal, abort.signal]) : abort.signal;
|
|
373
|
+
const current = () => {
|
|
374
|
+
combined.throwIfAborted();
|
|
375
|
+
if (this.#closed || state.disposed || state.state !== 'EVALUATING' || !worker.healthy || state.worker !== worker)
|
|
376
|
+
fail('CANCELLED', '常駐 Lisp の実行は取り消されています。');
|
|
377
|
+
};
|
|
378
|
+
try {
|
|
379
|
+
current();
|
|
380
|
+
if (mode === 'compile') {
|
|
381
|
+
const checked = await this.journalRequest(state, worker, 'task-compile', { code }, this.#config.timeoutMs, combined, false);
|
|
382
|
+
current();
|
|
383
|
+
if (!checked.ok || checked.proposals.length)
|
|
384
|
+
fail('TASK_COMPILE_FAILED', String(checked.value).slice(0, 1000));
|
|
385
|
+
return { value: null, output: worker.output(), generation: worker.generation };
|
|
386
|
+
}
|
|
387
|
+
const encoded = JSON.stringify(input);
|
|
388
|
+
if (!encoded || Buffer.byteLength(encoded) > 64 * 1024 * 1024)
|
|
389
|
+
fail('TASK_INPUT_LIMIT', 'Task input is too large.');
|
|
390
|
+
const scratch = await mkdtemp(join(worker.layout.scratch, 'hot-'));
|
|
391
|
+
const inputPath = join(worker.layout.inputs, randomUUID());
|
|
392
|
+
await writeFile(inputPath, encoded, { flag: 'wx', mode: 0o400 });
|
|
393
|
+
current();
|
|
394
|
+
const response = await this.journalRequest(state, worker, 'task', { code, input: inputPath, scratch }, this.#config.timeoutMs, combined, false);
|
|
395
|
+
current();
|
|
396
|
+
if (!response.ok || response.proposals.length)
|
|
397
|
+
fail('TASK_EXECUTION_FAILED', String(response.value).slice(0, 1000));
|
|
398
|
+
const result = await snapshot(scratch, 'task-result.json', []);
|
|
399
|
+
if (!result.exists)
|
|
400
|
+
fail('TASK_RESULT_MISSING', 'Task result was not saved.');
|
|
401
|
+
const bytes = await checkedBytes(result);
|
|
402
|
+
current();
|
|
403
|
+
return { value: JSON.parse(bytes.toString('utf8')), output: worker.output(), generation: worker.generation };
|
|
404
|
+
}
|
|
405
|
+
catch (error) {
|
|
406
|
+
if (!worker.healthy)
|
|
407
|
+
this.halted(state, error);
|
|
408
|
+
throw error;
|
|
409
|
+
}
|
|
410
|
+
finally {
|
|
411
|
+
state.active.delete(abort);
|
|
412
|
+
if (state.state === 'EVALUATING' && worker.healthy)
|
|
413
|
+
state.state = 'READY';
|
|
414
|
+
}
|
|
415
|
+
}
|
|
353
416
|
async startWorker(state) {
|
|
354
417
|
await this.authorizeCodingTask(state.owner);
|
|
355
418
|
if (state.admission)
|
|
@@ -429,16 +492,8 @@ export class LispManager {
|
|
|
429
492
|
if (this.#closed || state.disposed || state.state !== 'PREFLIGHT')
|
|
430
493
|
fail('CANCELLED', 'Lisp の起動を取り消しました。');
|
|
431
494
|
const occupied = () => [...this.#agents.values()].filter(a => a.slotReserved || (a.worker && !a.worker.stopped)).length;
|
|
432
|
-
if (occupied() >= this.#config.maxWorkers) {
|
|
433
|
-
const candidates = [...this.#agents.values()].filter(a => a !== state && this.canSuspend(a)).sort((a, b) => (a.idleSince ?? 0) - (b.idleSince ?? 0));
|
|
434
|
-
for (const candidate of candidates) {
|
|
435
|
-
await this.suspend(candidate);
|
|
436
|
-
if (occupied() < this.#config.maxWorkers)
|
|
437
|
-
break;
|
|
438
|
-
}
|
|
439
|
-
}
|
|
440
495
|
if (occupied() >= this.#config.maxWorkers)
|
|
441
|
-
throw new LispError('WORKER_LIMIT', 'Lisp
|
|
496
|
+
throw new LispError('WORKER_LIMIT', 'Lisp の起動枠はすべて使用中です。既存リポジトリの worker と状態は保持します。', '使い終わったセッションを明示的に disable するか、maxWorkers の設定を確認して再試行してください。');
|
|
442
497
|
if (this.#closed || state.disposed || state.state !== 'PREFLIGHT')
|
|
443
498
|
fail('CANCELLED', 'Lisp の起動を取り消しました。');
|
|
444
499
|
state.slotReserved = true;
|
|
@@ -455,6 +510,8 @@ export class LispManager {
|
|
|
455
510
|
if (this.#closed || state.disposed || state.state !== 'READY' || state.hostBusy || state.admission || state.active.size)
|
|
456
511
|
return;
|
|
457
512
|
state.idleSince = Date.now();
|
|
513
|
+
if (this.#config.idleTimeoutMs === 0)
|
|
514
|
+
return;
|
|
458
515
|
state.idleTimer = setTimeout(() => {
|
|
459
516
|
void this.suspend(state).then(() => {
|
|
460
517
|
// A background job can outlive the last evaluation. Recheck after it ends.
|
|
@@ -903,7 +960,10 @@ export class LispManager {
|
|
|
903
960
|
const taskSummary = taskMode ? await this.#store.taskSummary(owner) : undefined;
|
|
904
961
|
const operations = summary.operations.map(o => ({ id: o.operation_id, agent: o.agent_id, kind: o.kind, state: o.state, updatedAt: o.updated_at }));
|
|
905
962
|
return { approval, enabled: true, managedOperations, managedOperationCount: managed.total, managedOperationsTruncated: managed.truncated, managedReconciliationRequired: managedReconciliation, state: managedReconciliation ? 'RECONCILIATION_REQUIRED' : unconfirmed ? 'STOP_UNCONFIRMED' : taskMode && state.state === 'RECOVERY_REQUIRED' && !state.worker ? 'TASK_READY' : state.state,
|
|
906
|
-
generation: state.worker?.generation ?? null, supervisorPid: state.worker?.supervisorPid ?? null,
|
|
963
|
+
generation: state.worker?.generation ?? null, supervisorPid: state.worker?.supervisorPid ?? null,
|
|
964
|
+
runtimePid: state.worker?.runtimePid ?? null, repositoryRoot: state.worker?.repositoryRoot ?? null,
|
|
965
|
+
owner: { hostPid: process.pid, sessionId: owner.sessionId, agentId: owner.agentId },
|
|
966
|
+
error: unconfirmed?.error ?? (taskMode && !state.worker ? null : state.error ?? null),
|
|
907
967
|
jobs: [...(state.worker?.jobStatus() ?? []), ...[...state.ownedJobs ?? []].map(operationId => ({ operationId, owner: 'kiokuko-execution' }))],
|
|
908
968
|
executionMode: this.#config.executionMode,
|
|
909
969
|
compilation: state.compilation ?? null, resumed: state.resumed ?? false,
|
|
@@ -1002,7 +1062,7 @@ export class LispManager {
|
|
|
1002
1062
|
typesafe: '(kioku.typesafe:status); (kioku.typesafe:evaluate state questions :model "jev-latest" :timeout-ms 30000). Explicit semantic decisions via the host; consume answers with gethash. Strings/hash tables/vectors use JSON conventions. Catch kioku.typesafe:service-error; no retries or approval bypass. Configure with /kioku-typesafe-key.',
|
|
1003
1063
|
describe: 'symbol="kioku.files" lists bundled exports; symbol="kioku.user" lists your task functions; an exact function name returns arguments/docs.',
|
|
1004
1064
|
workflow: 'Define task-specific defun helpers once, compose them into one useful operation, and call that function in later evaluations. Batch known reads and checks; return a compact result. Definitions last for this worker generation. Stop before decisions requiring new evidence or approval.',
|
|
1005
|
-
hot: 'Use lisp_hot_contract, lisp_hot_install and lisp_hot_call for approved project-shared functions.
|
|
1065
|
+
hot: 'Use lisp_hot_contract, lisp_hot_install and lisp_hot_call for approved project-shared functions. The exact owner reuses this worker with a fresh package, private result scratch and no host RPC. Other owners cannot borrow it. This is not heap security isolation; write pure functions with explicit dependencies. No mode switch is needed. lisp_hot_status reads active versions.',
|
|
1006
1066
|
run: '(kioku.process:run "node" (list "--test" "--experimental-test-isolation=none" "test/public.test.mjs") :directory "project") uses a project-relative directory in development mode (scratch-relative in protected mode). Check final receipts and result-code.',
|
|
1007
1067
|
inspect: 'lisp_inspect accepts ref, or resultOperationId with section/offset/limit (Unicode characters). Never rerun to retrieve output.',
|
|
1008
1068
|
reads: 'Use native read/glob/grep/skill for repository exploration; lisp_eval.inputs for read-only workspace or session-attachment copies.',
|