kiokuko-dsh 0.1.26 → 0.1.28

package/dist/dsh/host-adapter.d.ts

@@ -2,6 +2,7 @@ import { Context } from '@deepseek-ai/cordis';
 import { KIOKUKO_DSH_HOST_SERVICE, type DshCompositionHost } from './composition.js';
 import { type DshLlm, type DshSessionQuery } from './session-memory-finalizer.js';
 import { type DshAdvisoryCall } from './advisory-runner.js';
+import { type EnnoNextAction } from '../enno-oduno/types.js';
 export interface DshAdvisoryHost {
     readonly verifyReadOnly: (call: DshAdvisoryCall) => boolean | PromiseLike<boolean>;
     readonly execute: (call: DshAdvisoryCall) => Promise<unknown>;
@@ -23,6 +24,10 @@ export interface DshHostAdapter {
     readonly host: DshCompositionHost;
     readonly dispose: () => Promise<void>;
 }
+export declare function pluginContinuationId(value: unknown): string | undefined;
+export declare function recoveryMessage(continuationId: string, answer: string): unknown;
+export declare function eventContinuationId(data: unknown): string | undefined;
+export declare function continuationMessage(continuationId: string, nextAction: EnnoNextAction): unknown;
 export declare function createDshHostAdapter(ctx: Context, options?: DshHostAdapterOptions): DshHostAdapter;
 export { KIOKUKO_DSH_HOST_SERVICE };
 //# sourceMappingURL=host-adapter.d.ts.map

package/dist/dsh/host-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"host-adapter.d.ts","sourceRoot":"","sources":["../../src/dsh/host-adapter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAC7C,OAAO,EACL,wBAAwB,EACxB,KAAK,kBAAkB,EAExB,MAAM,kBAAkB,CAAA;AAkBzB,OAAO,EAA0C,KAAK,MAAM,EAAgD,KAAK,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAEvK,OAAO,EAAqB,KAAK,eAAe,EAA+B,MAAM,sBAAsB,CAAA;AAoG3G,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,eAAe,KAAK,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,CAAA;IAClF,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,eAAe,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CAC9D;AAMD,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAA;IAC9B,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAA;IACrC,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAA;IAChC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAA;IAC3B,6EAA6E;IAC7E,QAAQ,CAAC,YAAY,CAAC,EAAE,eAAe,CAAA;IACvC,oEAAoE;IACpE,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAClC,0EAA0E;IAC1E,QAAQ,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAA;CACpC;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAA;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CACtC;AAmOD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,GAAE,qBAA0B,GAAG,cAAc,CA8xDtG;AAsBD,OAAO,EAAE,wBAAwB,EAAE,CAAA"}
+{"version":3,"file":"host-adapter.d.ts","sourceRoot":"","sources":["../../src/dsh/host-adapter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAC7C,OAAO,EACL,wBAAwB,EACxB,KAAK,kBAAkB,EAExB,MAAM,kBAAkB,CAAA;AAkBzB,OAAO,EAA0C,KAAK,MAAM,EAAgD,KAAK,eAAe,EAAE,MAAM,+BAA+B,CAAA;AAEvK,OAAO,EAAqB,KAAK,eAAe,EAA+B,MAAM,sBAAsB,CAAA;AAiB3G,OAAO,EAAuD,KAAK,cAAc,EAAuB,MAAM,wBAAwB,CAAA;AAmFtI,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,cAAc,EAAE,CAAC,IAAI,EAAE,eAAe,KAAK,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,CAAA;IAClF,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,eAAe,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;CAC9D;AAMD,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAA;IAC9B,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAA;IACrC,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAA;IAChC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAA;IAC3B,6EAA6E;IAC7E,QAAQ,CAAC,YAAY,CAAC,EAAE,eAAe,CAAA;IACvC,oEAAoE;IACpE,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAClC,0EAA0E;IAC1E,QAAQ,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAA;CACpC;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAA;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CACtC;AAoED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAWvE;AAOD,wBAAgB,eAAe,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAU/E;AAsBD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAKrE;AAED,wBAAgB,mBAAmB,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,GAAG,OAAO,CAU/F;AAiGD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,GAAE,qBAA0B,GAAG,cAAc,CA+yDtG;AAsBD,OAAO,EAAE,wBAAwB,EAAE,CAAA"}

package/dist/dsh/host-adapter.js

@@ -95,21 +95,26 @@ function isHumanMessage(value) {
     const source = objectRecord(message?.source);
     return source?.kind === 'user';
 }
-function pluginContinuationId(value) {
+const CONTINUATION_ID = /^[0-9a-f]{64}$/u;
+export function pluginContinuationId(value) {
     const message = objectRecord(value);
     const source = objectRecord(message?.source);
-    if (source?.kind !== 'plugin' || source.plugin !== 'kiokuko-dsh'
-        || (source.form !== 'continuation' && source.form !== 'loop-recovery'))
+    if (source?.kind !== 'plugin' || source.plugin !== 'kiokuko-dsh')
         return undefined;
-    return typeof source.deliveryId === 'string' && /^[0-9a-f]{64}$/u.test(source.deliveryId)
-        ? source.deliveryId
-        : undefined;
+    const messageId = message?.id;
+    if (source.form === 'instructions' && typeof messageId === 'string' && CONTINUATION_ID.test(messageId)) {
+        return messageId;
+    }
+    if ((source.form !== 'continuation' && source.form !== 'loop-recovery' && source.form !== 'instructions')
+        || typeof source.deliveryId !== 'string' || !CONTINUATION_ID.test(source.deliveryId))
+        return undefined;
+    return source.deliveryId;
 }
 function isLoopRecoveryMessage(value) {
     const source = objectRecord(objectRecord(value)?.source);
     return source?.kind === 'plugin' && source.plugin === 'kiokuko-dsh' && source.form === 'loop-recovery';
 }
-function recoveryMessage(continuationId, answer) {
+export function recoveryMessage(continuationId, answer) {
     return Object.freeze({
         id: continuationId,
         role: 'user',
@@ -117,7 +122,7 @@ function recoveryMessage(continuationId, answer) {
                 type: 'text',
                 text: `The user reviewed the stopped Kiokuko loop and supplied this recovery instruction:\n\n${answer}`,
             }],
-        source: { kind: 'plugin', plugin: 'kiokuko-dsh', form: 'loop-recovery', deliveryId: continuationId },
+        source: { kind: 'plugin', plugin: 'kiokuko-dsh', form: 'instructions' },
     });
 }
 function boundedMessageText(value) {
@@ -141,14 +146,14 @@ function boundedUtf8Text(value, maximumBytes) {
     }
     return result;
 }
-function eventContinuationId(data) {
+export function eventContinuationId(data) {
     const direct = pluginContinuationId(data);
     if (direct !== undefined)
         return direct;
     const record = objectRecord(data);
     return pluginContinuationId(record?.message);
 }
-function continuationMessage(continuationId, nextAction) {
+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.`;
@@ -156,7 +161,7 @@ function continuationMessage(continuationId, nextAction) {
         id: continuationId,
         role: 'user',
         content: [{ type: 'text', text: work }],
-        source: { kind: 'plugin', plugin: 'kiokuko-dsh', form: 'continuation', deliveryId: continuationId },
+        source: { kind: 'plugin', plugin: 'kiokuko-dsh', form: 'instructions' },
     });
 }
 function phaseForState(state) {
@@ -842,7 +847,17 @@ export function createDshHostAdapter(ctx, options = {}) {
             terminalizeLedgerRunInTransaction(database, runId, 'cancelled');
             return undefined;
         }
-        const automaticMessage = event.nativeMessages?.find((message) => pluginContinuationId(message) !== undefined && !isLoopRecoveryMessage(message));
+        const automaticMessage = event.nativeMessages?.find((message) => {
+            const continuationId = pluginContinuationId(message);
+            if (continuationId === undefined)
+                return false;
+            const outbox = database.prepare(`
+        SELECT message_form AS messageForm
+          FROM dsh_continuation_outbox
+         WHERE continuation_id = ?
+      `).get(continuationId);
+            return outbox === undefined ? !isLoopRecoveryMessage(message) : outbox.messageForm !== 'loop-recovery';
+        });
         const automaticClaimId = automaticMessage === undefined ? undefined : pluginContinuationId(automaticMessage);
         const decision = snapshot ? decideDshContinuation(database, {
             dshSessionId: event.sessionId, cwd: event.cwd,
@@ -1490,7 +1505,7 @@ export function createDshHostAdapter(ctx, options = {}) {
                     });
                     const outbox = readPendingOutbox(database, item.sessionId).find((candidate) => candidate.receiptId === job.receiptId);
                     if (outbox !== undefined) {
-                        replacePendingOutboxMessageInTransaction(database, job.receiptId, recoveryMessage(outbox.continuationId, answer), options.now?.() ?? new Date().toISOString());
+                        replacePendingOutboxMessageInTransaction(database, job.receiptId, recoveryMessage(outbox.continuationId, answer), 'loop-recovery', options.now?.() ?? new Date().toISOString());
                     }
                 }));
                 return { kind: 'completed', nextKind: 'delivery' };
@@ -1542,7 +1557,7 @@ export function createDshHostAdapter(ctx, options = {}) {
                 await runtime.withDatabase((database) => withImmediateTransaction(database, () => {
                     const outbox = readPendingOutbox(database, item.sessionId).find((candidate) => candidate.receiptId === job.receiptId);
                     if (outbox !== undefined)
-                        replacePendingOutboxMessageInTransaction(database, job.receiptId, continuationMessage(outbox.continuationId, state.nextAction));
+                        replacePendingOutboxMessageInTransaction(database, job.receiptId, continuationMessage(outbox.continuationId, state.nextAction), 'continuation');
                 }));
                 return { kind: 'completed', nextKind: 'delivery' };
             }
@@ -1562,7 +1577,7 @@ export function createDshHostAdapter(ctx, options = {}) {
         },
         beforeDelivery: async (job, outbox, signal) => {
             boundarySignals.set(job.dshSessionId, signal);
-            if (isLoopRecoveryMessage(outbox.message))
+            if (outbox.messageForm === 'loop-recovery')
                 return 'deliver';
             const item = currentSession(job.dshSessionId);
             if (item === undefined || item.closed || item.runId !== job.runId)
@@ -1612,7 +1627,7 @@ export function createDshHostAdapter(ctx, options = {}) {
                     claimId: guarded.claim.claimId,
                     ...(options.now === undefined ? {} : { now: options.now() }),
                 });
-                replacePendingOutboxMessageInTransaction(database, job.receiptId, recoveryMessage(outbox.continuationId, answer), options.now?.() ?? new Date().toISOString());
+                replacePendingOutboxMessageInTransaction(database, job.receiptId, recoveryMessage(outbox.continuationId, answer), 'loop-recovery', options.now?.() ?? new Date().toISOString());
             }));
             return 'deliver';
         },
@@ -1652,7 +1667,7 @@ export function createDshHostAdapter(ctx, options = {}) {
                 });
                 const outbox = readPendingOutbox(database, item.sessionId).find((candidate) => candidate.receiptId === job.receiptId);
                 if (outbox !== undefined) {
-                    replacePendingOutboxMessageInTransaction(database, job.receiptId, recoveryMessage(outbox.continuationId, answer), options.now?.() ?? new Date().toISOString());
+                    replacePendingOutboxMessageInTransaction(database, job.receiptId, recoveryMessage(outbox.continuationId, answer), 'loop-recovery', options.now?.() ?? new Date().toISOString());
                 }
                 database.prepare(`
           UPDATE dsh_boundary_jobs