kiokuko-dsh 0.2.39 → 0.2.41

package/dist/dsh/host-adapter.js

@@ -37,7 +37,6 @@ import { readCodingWorkflow } from "./coding-workflow/store.js";
 import { stableLispCapabilities } from "./lisp-service-key.js";
 import { createEfficiencyHost } from "./host-adapter/efficiency-host.js";
 import { createMemoryReviewHost } from "./host-adapter/memory-review-host.js";
-import { createEnnoMemoryHost } from "./host-adapter/enno-memory-host.js";
 import { createSessionAccess } from "./host-adapter/session-access.js";
 import { createEvolutionHost } from "./host-adapter/evolution-host.js";
 import { onNativeEvent, onNativeServiceEvent, } from "./host-adapter/native-events.js";
@@ -60,8 +59,6 @@ import { AnswerReviewConfig } from "./answer-review/contracts.js";
 import { AutoMemoryReviewCoordinator, } from "./auto-memory-review.js";
 import { MemoryReviewConfig } from "../memory/review/contracts.js";
 import { MemoryRetrievalConfig } from "../memory/retrieval-contracts.js";
-import { DshEnnoMemoryRefresh } from "./enno-memory-refresh.js";
-import { EnnoMemoryConfig } from "./config.js";
 import { CompletionConfig } from "./task-completion.js";
 import { saveSessionNotice } from "./plugin-records.js";
 import { MemoryEvolutionConfig, } from "../memory/evolution/contracts.js";
@@ -70,7 +67,6 @@ import { readExecutionSelection, writeExecutionSelection, } from "./execution-se
 import { LISP_CODING_SERVICE, } from "./lisp/coding-choice.js";
 import { DshSkillPrompts } from "./skill-prompts.js";
 import { nativeModelCatalog } from "./native-model-catalog.js";
-import { DshEnnoDelegation } from "./enno-delegation.js";
 import { createDshAgenticReplayHost } from "./agenticreplay-host.js";
 import { fileURLToPath } from "node:url";
 import { realpathSync } from "node:fs";
@@ -82,13 +78,10 @@ import { DiffReviewConfig } from "./config.js";
 import { DiffReviewController } from "../diff-review/controller.js";
 import { DshMemoryFinalizer, } from "./session-memory-finalizer.js";
 import { DshPonytailModes } from "./commands.js";
-import { createDshConfirmationAnswerer, } from "./user-interaction.js";
 import { createDshCapabilityCatalog, } from "./capability-catalog.js";
 import { STANDARD_SKILL_MANIFESTS } from "./standard-skills.js";
 import { canonicalContentHash, compareCanonicalStrings, } from "../serialization/validate.js";
 import { KiokukoError } from "../errors.js";
-import { stateForSnapshot } from "../enno-oduno/service.js";
-import { readEnnoSnapshot } from "../enno-oduno/store.js";
 import { DeepPlanningController } from "../deep-thinker/controller.js";
 import { DshSessionLogMirror, } from "./session-log-mirror.js";
 import { DshExecutionSupport } from "./execution-support.js";
@@ -216,17 +209,6 @@ export function eventContinuationId(data) {
     const record = objectRecord(data);
     return pluginContinuationId(record?.message);
 }
-export function continuationMessage(continuationId, nextAction) {
-    const work = nextAction === "execute_work_unit"
-        ? "The current WorkUnit is not accepted unless the latest Enno result says so. Correct or report only that WorkUnit."
-        : `Continue only the current Kiokuko phase for nextAction=${nextAction}. Do not skip ahead.`;
-    return Object.freeze({
-        id: continuationId,
-        role: "user",
-        content: [{ type: "text", text: work }],
-        source: { kind: KIOKUKO_DSH_SOURCE_KIND, form: "instructions" },
-    });
-}
 async function capabilityCatalog(skills, tools, context) {
     if (skills?.snapshot === undefined || tools?.schemas === undefined) {
         throw new Error("kiokuko-dsh requires native Skill and tool snapshots");
@@ -326,8 +308,6 @@ export function createDshHostAdapter(ctx, options = {}) {
     const llm = options.llm ?? native.get("llm", false);
     const reviewConfig = DiffReviewConfig.parse(options.diffReview ?? {});
     const completionMode = CompletionConfig.parse(options.completion ?? {}).mode;
-    const advisory = options.advisory ??
-        native.get("dshAdvisory", false);
     const modelCatalog = nativeModelCatalog(native.get("llm", false), native.get("settings", false));
     const modelCompatibility = options.modelCompatibility ??
         native.get("dshModelCompatibility", false);
@@ -378,7 +358,6 @@ export function createDshHostAdapter(ctx, options = {}) {
         new SemanticCompactionCoordinator(ctx, decisions, root, options.observationPack);
     const modelHandoff = new ModelHandoff(ctx, decisions, root, options.modelHandoff);
     const lifecycleMemory = new DshLifecycleMemory(ctx, runtime, root);
-    const delegation = new DshEnnoDelegation(runtime, native.get("subagents", false));
     const deepPlanning = new DeepPlanningController({
         runtime,
         decisions,
@@ -402,24 +381,7 @@ export function createDshHostAdapter(ctx, options = {}) {
             return [...catalog.skills, ...catalog.tools];
         },
     });
-    const isGenericNativeChild = (agent) => isNativeSubagent(agent) &&
-        !delegation.isChild(agent) &&
-        !deepPlanning.executor.isChild(agent);
-    const childGuardDisposer = tools?.guard((value) => {
-        const execution = value;
-        return execution.agent
-            ? delegation.toolDenial(execution.agent, execution.name ?? "", execution.arguments)
-            : undefined;
-    });
-    const childExecutionDisposer = onNativeEvent(ctx, "tools/execute", async (execution, next) => {
-        if (execution.agent && delegation.isChild(execution.agent)) {
-            await delegation.assertCurrent(execution.agent);
-            const denial = delegation.toolDenial(execution.agent, execution.name, execution.arguments);
-            if (denial)
-                throw new KiokukoError("CONFLICT", denial);
-        }
-        return next();
-    }, { prepend: true });
+    const isGenericNativeChild = (agent) => isNativeSubagent(agent) && !deepPlanning.executor.isChild(agent);
     const sessionCachePath = options.sessionCachePath ??
         (options.databasePath === undefined
             ? undefined
@@ -442,12 +404,11 @@ export function createDshHostAdapter(ctx, options = {}) {
         sessionMirror,
     });
     const policy = new DshToolPolicy({
-        phase: "intake",
+        phase: "normal",
         runId: "pending",
         workspace: "pending",
         orchestrationId: "pending",
         revision: 1,
-        routeEpoch: 0,
     });
     const modes = new DshPonytailModes();
     const turnState = createTurnState(modes, policy, (runId) => selections.get(runId));
@@ -464,21 +425,6 @@ export function createDshHostAdapter(ctx, options = {}) {
             ? {}
             : { tools: { guard: tools.guard.bind(tools) } }),
     });
-    const ennoMemory = new DshEnnoMemoryRefresh(runtime, EnnoMemoryConfig.parse(options.ennoMemory ?? {}), (value) => efficiencyHost.efficiency?.recordEnnoMemory(value));
-    const { refreshEnnoMemory } = createEnnoMemoryHost({
-        ennoMemory,
-        runtime,
-        executionSupport,
-        delegation,
-        getSelection: (runId) => selections.get(runId),
-        turnState,
-        currentSession,
-        capabilityCatalog,
-        skills,
-        tools,
-        assertTurnStoppingCatalog: (expected, actual) => gate.assertTurnStoppingCatalog(expected, actual),
-        isHumanMessage,
-    });
     const executionBinding = turnState.executionBinding;
     const memoryFinalizer = new DshMemoryFinalizer({
         onDeepFinalized: (sessionId) => deepPlanning.deliver(sessionId),
@@ -535,9 +481,6 @@ export function createDshHostAdapter(ctx, options = {}) {
         startSeq: 0,
     });
     deepPlanning.attachFinalizer(() => memoryFinalizer.kick());
-    const confirmationAnswerer = userQuestions === undefined
-        ? undefined
-        : createDshConfirmationAnswerer(userQuestions);
     const observation = createSessionObservation(runtime);
     const captureInitialInput = observation.captureInitialInput;
     let retireSupersededRun;
@@ -556,9 +499,7 @@ export function createDshHostAdapter(ctx, options = {}) {
         runtime,
         decisions,
         answerReview,
-        delegation,
         executionSupport,
-        ennoMemory,
         memoryFinalizer,
         autoReview,
         sessionMirror,
@@ -570,7 +511,6 @@ export function createDshHostAdapter(ctx, options = {}) {
         setSelection: (runId, value) => {
             selections.set(runId, value);
         },
-        refreshEnnoMemory,
         executionBinding,
         captureInitialInput,
         contextMessages: (event, pending) => contextMessages(event, pending),
@@ -583,7 +523,6 @@ export function createDshHostAdapter(ctx, options = {}) {
         cancelBoundarySession: (sessionId) => boundaryWorker.cancelSession(sessionId),
         isSelectionBlocked: (agent) => routing.isSelectionBlocked(agent),
         closeTurn: (input) => runLifecycle.closeTurn(input),
-        readStateForRun: (item) => runtime.withDatabase((db) => stateForRun(db, item)),
         capabilityCatalog,
         sessionEventSource,
         objectRecord,
@@ -702,42 +641,6 @@ export function createDshHostAdapter(ctx, options = {}) {
             advance: async (input) => {
                 policy.beginTurn(input.agent.session.id, input.turn);
             },
-            resumeConfirmation: async (input) => runtime.withDatabase(async (db) => {
-                const sessionId = input.agent.session.id;
-                if (detachedDemandSessions.has(sessionId))
-                    return false;
-                const current = currentSession(sessionId);
-                if (current !== undefined) {
-                    if (current.nativeAgent !== input.agent ||
-                        current.nativeSession !== input.agent.session ||
-                        current.turn > input.turn) {
-                        if (process.env.KIOKUKO_INTENT_DEBUG === "1")
-                            console.error("confirmation resume current mismatch", {
-                                turn: input.turn,
-                                currentTurn: current.turn,
-                                agent: current.nativeAgent === input.agent,
-                                session: current.nativeSession === input.agent.session,
-                            });
-                        return false;
-                    }
-                }
-                const project = await resolveProjectWorkspaceReadOnly(db, answerCwd(input.agent), { allowDirectory: true });
-                if (!project)
-                    return false;
-                const candidates = db
-                    .prepare(`SELECT lr.run_id AS runId
-        FROM ledger_runs AS lr
-        JOIN enno_contracts AS ec ON ec.run_id = lr.run_id
-        WHERE lr.workspace = ? AND lr.dsh_session_id = ? AND lr.status = 'active'
-          AND ec.repository_root = ? AND ec.status = 'needs_confirmation'
-        ORDER BY lr.created_at, lr.run_id LIMIT 2`)
-                    .all(project.workspace, sessionId, project.repositoryRoot);
-                if (process.env.KIOKUKO_INTENT_DEBUG === "1")
-                    console.error("confirmation resume candidates", candidates.length);
-                return (candidates.length === 1 &&
-                    (current === undefined ||
-                        current.runId === candidates[0].runId));
-            }),
             replay: async (input) => runtime.withDatabase((db) => {
                 const sessionId = input.agent.session.id;
                 if (detachedDemandSessions.has(sessionId))
@@ -799,7 +702,6 @@ export function createDshHostAdapter(ctx, options = {}) {
                 if (current &&
                     current.turn < input.turn &&
                     input.messages.some(isHumanMessage) &&
-                    !current.prepared.ennoOduno.applicable &&
                     !resumeCoding)
                     return false;
                 if (current)
@@ -814,12 +716,10 @@ export function createDshHostAdapter(ctx, options = {}) {
                 // Recovery still goes through admission's exact workspace/session checks.
                 return Boolean(db
                     .prepare(`SELECT 1 FROM ledger_runs lr
-        LEFT JOIN enno_contracts ec ON ec.run_id=lr.run_id
         LEFT JOIN dsh_coding_workflows cw ON cw.run_id=lr.run_id
         WHERE lr.workspace=? AND lr.dsh_session_id=? AND lr.status='active'
-          AND ((ec.repository_root=? AND ec.status NOT IN ('completed','cancelled','blocked'))
-            OR (?=1 AND json_extract(cw.snapshot_json,'$.state') NOT IN ('completed','cancelled','superseded'))) LIMIT 1`)
-                    .get(project.workspace, input.agent.session.id, project.repositoryRoot, requestIntent?.relation === "new" ? 0 : 1));
+          AND (?=1 AND json_extract(cw.snapshot_json,'$.state') NOT IN ('completed','cancelled','superseded')) LIMIT 1`)
+                    .get(project.workspace, input.agent.session.id, requestIntent?.relation === "new" ? 0 : 1));
             }),
             classify: (input, task) => classifyTaskForIntake(decisions, dshTurnRequestId({
                 dshSessionId: input.agent.session.id,
@@ -980,9 +880,8 @@ export function createDshHostAdapter(ctx, options = {}) {
                         pair: stored.value.headWorker,
                     };
                 }
-                // An existing approved Enno or Deep configuration owns its own roles.
-                if (stored?.value.mode === "enno" ||
-                    stored?.value.mode === "deep-thinker")
+                // An existing approved Deep configuration owns its own roles.
+                if (stored?.value.mode === "deep-thinker")
                     return undefined;
             }
             if (!pairLlm)
@@ -1137,7 +1036,6 @@ export function createDshHostAdapter(ctx, options = {}) {
         modelAuto,
         answerReview,
         semanticCompaction,
-        delegation,
         deepPlanning,
         isGenericNativeChild,
         demand,
@@ -1157,7 +1055,6 @@ export function createDshHostAdapter(ctx, options = {}) {
         prepareTurn: (event) => gate.prepare(event),
         mapPreStep,
         currentSession,
-        readStateForRun: (item) => runtime.withDatabase((db) => stateForRun(db, item)),
         refreshMemoryOwner: admission.refreshMemoryOwner,
     });
     const contextMessages = createContextMessages({
@@ -1172,7 +1069,6 @@ export function createDshHostAdapter(ctx, options = {}) {
         systemSkillsFor: routing.systemSkillsFor,
         getSelection: (runId) => selections.get(runId),
         currentForAgentEvent,
-        advisoryEvidenceFor: (item, state) => toolHostModule.advisoryEvidenceFor(item, state),
         executionBinding,
         sessionEventSource,
     });
@@ -1183,22 +1079,13 @@ export function createDshHostAdapter(ctx, options = {}) {
         currentForAgentEvent,
         skills,
         tools,
-        sessions,
-        agents,
         gate,
         decisions,
-        delegation,
-        llm,
-        modelCatalog,
         executionSupport,
         executionBinding,
-        policy,
-        advisory,
         capabilityCatalog,
-        objectRecord,
     });
-    const { toolHost, advisoryRunner, assertTurnBoundary, submitAdvisory } = toolHostModule;
-    const advisoryEvidenceFor = toolHostModule.advisoryEvidenceFor;
+    const { toolHost, assertTurnBoundary } = toolHostModule;
     const boundaries = createBoundaries({
         isGenericNativeChild,
         ctx,
@@ -1210,31 +1097,18 @@ export function createDshHostAdapter(ctx, options = {}) {
         tools,
         userQuestions,
         gate,
-        delegation,
         executionSupport,
         answerReview,
         sessionMirror,
         currentSession,
-        currentForAgentEvent,
-        stateForRun,
-        systemSkillsFor: routing.systemSkillsFor,
-        getSkillPrompts: () => skillPrompts,
-        refreshEnnoMemory,
-        confirmationAnswerer,
-        assertTurnBoundary,
-        advisoryRunner,
-        submitAdvisory,
-        advisoryEvidenceFor,
-        applyPolicy: turnState.applyPolicy,
         capabilityCatalog,
         closeTurn: (input) => runLifecycle.closeTurn(input),
         sessionEventSource,
         boundedUtf8Text,
         boundedMessageText,
         recoveryMessage,
-        continuationMessage,
     });
-    const { boundaryWorker, ennoController, deliverCompletionReport, boundarySessionStartDisposer, } = boundaries;
+    const { boundaryWorker, deliverCompletionReport, boundarySessionStartDisposer, } = boundaries;
     const applicationDisposer = mountHostMemoryApplication({
         questions: userQuestions,
         ctx,
@@ -1244,7 +1118,6 @@ export function createDshHostAdapter(ctx, options = {}) {
         skills,
         agents,
         sessions,
-        delegation,
         currentSession,
         turnState,
         gate,
@@ -1270,13 +1143,11 @@ export function createDshHostAdapter(ctx, options = {}) {
                     agents?.get(agent.id) !== agent ||
                     sessions?.get(session.id) !== session)
                     return undefined;
-                const child = delegation.observationBinding(agent);
-                const item = currentSession(child?.parentSessionId ?? session.id);
+                const item = currentSession(session.id);
                 if (!item ||
                     item.closed ||
-                    (child && child.runId !== item.runId) ||
-                    (!child &&
-                        (item.nativeAgent !== agent || item.nativeSession !== session)))
+                    item.nativeAgent !== agent ||
+                    item.nativeSession !== session)
                     return undefined;
                 return {
                     runId: item.runId,
@@ -1308,7 +1179,6 @@ export function createDshHostAdapter(ctx, options = {}) {
                     item.closed ||
                     item.nativeAgent !== agent ||
                     item.nativeSession !== session ||
-                    delegation.isChild(agent) ||
                     isGenericNativeChild(agent))
                     return undefined;
                 return {
@@ -1331,15 +1201,11 @@ export function createDshHostAdapter(ctx, options = {}) {
             sessions?.get(session.id) !== session ||
             isGenericNativeChild(agent))
             return undefined;
-        const child = delegation.observationBinding(agent);
-        const item = currentSession(child?.parentSessionId ?? session.id);
+        const item = currentSession(session.id);
         if (!item ||
             item.closed ||
-            (child && child.runId !== item.runId) ||
-            (!child && (item.nativeAgent !== agent || item.nativeSession !== session)))
-            return undefined;
-        if (child &&
-            delegation.toolDenial(agent, execution.name, execution.arguments))
+            item.nativeAgent !== agent ||
+            item.nativeSession !== session)
             return undefined;
         return {
             runId: item.runId,
@@ -1395,8 +1261,6 @@ export function createDshHostAdapter(ctx, options = {}) {
                     return cwd === root
                         ? nativeTaskAuthority.read(execution)
                         : undefined;
-                if (delegation.isChild(agent))
-                    return cwd === root ? resolveParentOwned(execution) : undefined;
                 const current = resolveParentOwned(execution);
                 if (execution.name === "kioku_read" && current) {
                     const item = currentSession(session.id);
@@ -1458,13 +1322,11 @@ export function createDshHostAdapter(ctx, options = {}) {
     }, ctx.get("planMode", false));
     const observationMount = observation.install({
         ctx,
-        ennoMemory,
         evolutionConfig,
         memoryFinalizer,
         currentSession,
         currentForAgentEvent,
         answerReview,
-        markModelUnavailable: (agent) => routing.markModelUnavailable(agent),
         recordManualChange: (sessionId, pending) => routing.recordManualChange(sessionId, pending),
         modelAuto,
         root,
@@ -1481,7 +1343,6 @@ export function createDshHostAdapter(ctx, options = {}) {
             if (!nativeAgent || !isGenericNativeChild(nativeAgent))
                 boundaryWorker.kick(sessionId, agent);
         },
-        stateForRun,
         objectRecord,
         isHumanMessage,
         eventContinuationId,
@@ -1494,19 +1355,15 @@ export function createDshHostAdapter(ctx, options = {}) {
         memoryFinalizer,
         autoReview,
         answerReview,
-        ennoController,
-        ennoMemory,
         executionSupport,
         gate,
         turnState,
         getSelection: (runId) => selections.get(runId),
         currentSession,
         currentForAgentEvent,
-        stateForRun,
         deliverCompletionReport,
         reviewBinding,
         evolutionConfig,
-        clearToolRun: toolHostModule.clearRun,
         sessionEventSource,
         onRunClosed: (runId, status, sessionId, authority) => lifecycleMemory.completed(runId, status, sessionId, authority),
     });
@@ -1520,7 +1377,7 @@ export function createDshHostAdapter(ctx, options = {}) {
             agent: (id) => agents?.get(id),
             logicalRun: resolveSessionRunId,
             ...(userQuestions ? { questions: userQuestions } : {}),
-            interactive: (agent) => !delegation.isChild(agent) && !deepPlanning.executor.isChild(agent),
+            interactive: (agent) => !deepPlanning.executor.isChild(agent),
             recordingRun: (agent) => deepPlanning.executor.recordingRun(agent),
             recordingParent: (agent) => deepPlanning.executor.recordingParent(agent),
         });
@@ -1532,7 +1389,6 @@ export function createDshHostAdapter(ctx, options = {}) {
         memoryFinalizer,
         agents,
         sessions,
-        delegation,
         deepPlanning,
         currentSession,
     });
@@ -1548,6 +1404,8 @@ export function createDshHostAdapter(ctx, options = {}) {
         on: (name, listener, options) => onNativeServiceEvent(ctx, name, listener, options),
     });
     const host = {
+        ...(ctx.get('kiokukoHarness', false)?.lifecycle
+            ? { harnessLifecycle: ctx.get('kiokukoHarness', false).lifecycle } : {}),
         ...(demand ? { onDemandIntake: demand } : {}),
         ...(taskWorkflow ? { taskWorkflow } : {}),
         bypassNativeIntake: isGenericNativeChild,
@@ -1576,7 +1434,6 @@ export function createDshHostAdapter(ctx, options = {}) {
         configureSkillPrompts(prompts) {
             skillPrompts = prompts;
         },
-        configureEnnoMemory: (config) => ennoMemory.configure(config),
         configureToolExposure: (config) => {
             toolExposureConfig = ToolExposureConfig.parse(config);
         },
@@ -1658,9 +1515,7 @@ export function createDshHostAdapter(ctx, options = {}) {
             await demand?.dispose();
             demandEnd?.();
             demandDisposed?.();
-            childGuardDisposer?.();
             discussionGuardDisposer?.();
-            childExecutionDisposer();
             routing.dispose();
             nativeTaskAuthority.dispose();
             nativeWorkers.dispose();
@@ -1676,7 +1531,6 @@ export function createDshHostAdapter(ctx, options = {}) {
                 failures.push(error);
             }
             const pausedSessions = new Set(turnState.sessionIds().filter((id) => executionSupport.paused(id)));
-            ennoMemory.close();
             executionSupport.dispose();
             try {
                 observationMount.disposeError();
@@ -1708,12 +1562,6 @@ export function createDshHostAdapter(ctx, options = {}) {
             catch (error) {
                 failures.push(error);
             }
-            try {
-                ennoController.dispose();
-            }
-            catch (error) {
-                failures.push(error);
-            }
             try {
                 await boundaryWorker.dispose();
             }
@@ -1786,7 +1634,6 @@ export function createDshHostAdapter(ctx, options = {}) {
                 failures.push(error);
             }
             turnState.clear();
-            toolHostModule.clear();
             boundaries.clear();
             admission.clear();
             observation.clear();
@@ -1797,14 +1644,5 @@ export function createDshHostAdapter(ctx, options = {}) {
         })()),
     };
 }
-function stateForRun(database, item) {
-    if (!item.prepared.ennoOduno.applicable)
-        return item.prepared.ennoOduno;
-    return stateForSnapshot(readEnnoSnapshot(database, {
-        runId: item.runId,
-        workspace: item.workspace,
-        orchestrationId: item.orchestrationId,
-    }));
-}
 export { KIOKUKO_DSH_HOST_SERVICE };
 //# sourceMappingURL=host-adapter.js.map