kiokuko-dsh 0.1.25 → 0.1.27

package/dist/dsh/context-injection.d.ts

@@ -6,6 +6,7 @@ export interface DshModelMessage {
     readonly role: 'user';
     readonly content: string;
     readonly source: DshMessageSource['kind'];
+    readonly name: string;
 }
 export interface DshDirectiveSourceSelection {
     readonly routeSkillNames: readonly string[];
@@ -22,5 +23,8 @@ export declare function injectDshContext(input: {
     readonly advisoryEvidence?: DshMessageSourceInput['advisoryEvidence'];
     readonly directive?: DshMessageSourceInput['directive'];
     readonly runtime?: Pick<DshRuntime, 'withDatabase'>;
+    readonly soulInSystemPrompt?: boolean;
+    /** Native DSH already carries the human message; emit only additional intake facts. */
+    readonly userTaskInConversation?: boolean;
 }): Promise<readonly DshModelMessage[]>;
 //# sourceMappingURL=context-injection.d.ts.map

package/dist/dsh/context-injection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context-injection.d.ts","sourceRoot":"","sources":["../../src/dsh/context-injection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAGzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAEvG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAQ3D,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAA;CAC1C;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE,CAAA;IAC3C,QAAQ,CAAC,UAAU,EAAE,SAAS,kBAAkB,EAAE,CAAA;CACnD;AAOD,sFAAsF;AACtF,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,EAAE,gBAAgB,GAAG,UAAU,CAAC,GAAG,2BAA2B,CAWpI;AAmBD,4EAA4E;AAC5E,wBAAsB,gBAAgB,CAAC,KAAK,EAAE;IAC5C,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAA;IACpC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,eAAe,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC5C,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,kBAAkB,EAAE,CAAA;IACnD,QAAQ,CAAC,gBAAgB,CAAC,EAAE,qBAAqB,CAAC,kBAAkB,CAAC,CAAA;IACrE,QAAQ,CAAC,SAAS,CAAC,EAAE,qBAAqB,CAAC,WAAW,CAAC,CAAA;IACvD,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAA;CACpD,GAAG,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC,CAqBtC"}
+{"version":3,"file":"context-injection.d.ts","sourceRoot":"","sources":["../../src/dsh/context-injection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAGzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAEvG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAQ3D,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAA;IACzC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE,CAAA;IAC3C,QAAQ,CAAC,UAAU,EAAE,SAAS,kBAAkB,EAAE,CAAA;CACnD;AAOD,sFAAsF;AACtF,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,EAAE,gBAAgB,GAAG,UAAU,CAAC,GAAG,2BAA2B,CAWpI;AAiCD,4EAA4E;AAC5E,wBAAsB,gBAAgB,CAAC,KAAK,EAAE;IAC5C,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAA;IACpC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,eAAe,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC5C,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,kBAAkB,EAAE,CAAA;IACnD,QAAQ,CAAC,gBAAgB,CAAC,EAAE,qBAAqB,CAAC,kBAAkB,CAAC,CAAA;IACrE,QAAQ,CAAC,SAAS,CAAC,EAAE,qBAAqB,CAAC,WAAW,CAAC,CAAA;IACvD,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAA;IACnD,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAA;IACrC,uFAAuF;IACvF,QAAQ,CAAC,sBAAsB,CAAC,EAAE,OAAO,CAAA;CAC1C,GAAG,OAAO,CAAC,SAAS,eAAe,EAAE,CAAC,CAuBtC"}

package/dist/dsh/context-injection.js

@@ -20,15 +20,32 @@ export function selectDshDirectiveSources(directive) {
         expertRefs: Object.freeze(expertRefs),
     });
 }
-function sourceInput(prepared, fallbackTask, routeSkillNames, expertRefs, directive) {
+function sourceInput(prepared, fallbackTask, routeSkillNames, expertRefs, directive, userTaskInConversation) {
     if (prepared.intake.status !== 'ready' && prepared.intake.status !== 'exhausted')
         throw new Error('Cannot inject context before intake is finalized');
     if (prepared.nextAction !== 'proceed')
         throw new Error('Cannot inject context when the host gate did not permit proceeding');
     const profile = prepared.intake.profile;
-    const finalized = [profile.target, profile.expected, profile.constraints].filter((value) => value !== null && value.length > 0).join('\n');
+    const fields = [profile.target, profile.expected, profile.constraints].filter((value) => value !== null && value.length > 0);
+    // Native DSH owns the original human message, including its attachments.
+    // Only additional intake facts belong in the plugin's context snapshot.
+    const original = fallbackTask.trim();
+    const additional = userTaskInConversation ? [...new Set(fields.map(value => {
+            const text = value.trim();
+            if (original.length === 0)
+                return text;
+            if (text === original)
+                return '';
+            if (text.startsWith(`${original}\n`) || text.startsWith(`${original}\r\n`))
+                return text.slice(original.length).trimStart();
+            return text;
+        }).filter(Boolean))] : fields;
+    const finalized = additional.join('\n');
+    const task = userTaskInConversation
+        ? (finalized.length === 0 ? '' : `Finalized intake:\n${finalized}`)
+        : (finalized.length === 0 || finalized === fallbackTask ? fallbackTask : `${fallbackTask}\n\nFinalized intake:\n${finalized}`);
     return {
-        task: finalized.length === 0 || finalized === fallbackTask ? fallbackTask : `${fallbackTask}\n\nFinalized intake:\n${finalized}`,
+        task,
         intakeStatus: prepared.intake.status,
         nextAction: 'proceed',
         memoryPolicy: prepared.memoryPolicy,
@@ -51,7 +68,8 @@ export async function injectDshContext(input) {
             });
         };
     const sources = await buildDshMessageSources({
-        ...sourceInput(input.prepared, input.task, input.routeSkillNames ?? [], input.expertRefs ?? [], input.directive),
+        ...sourceInput(input.prepared, input.task, input.routeSkillNames ?? [], input.expertRefs ?? [], input.directive, input.userTaskInConversation === true),
+        ...(input.soulInSystemPrompt === undefined ? {} : { soulInSystemPrompt: input.soulInSystemPrompt }),
         ...(input.advisoryEvidence === undefined ? {} : { advisoryEvidence: input.advisoryEvidence }),
         ...(assertMemoryCurrent === undefined ? {} : { assertMemoryCurrent }),
     });
@@ -59,6 +77,7 @@ export async function injectDshContext(input) {
         role: 'user',
         content: source.text,
         source: source.kind,
+        name: source.name,
     })));
 }
 //# sourceMappingURL=context-injection.js.map

package/dist/dsh/context-injection.js.map

@@ -1 +1 @@
-{"version":3,"file":"context-injection.js","sourceRoot":"","sources":["../../src/dsh/context-injection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"context-injection.js","sourceRoot":"","sources":["../../src/dsh/context-injection.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AAGlE,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAA;AAE7D,OAAO,EACL,8BAA8B,EAC9B,4BAA4B,EAC5B,wBAAwB,EACxB,sBAAsB,GACvB,MAAM,sBAAsB,CAAA;AAc7B,MAAM,eAAe,GAAG,IAAI,GAAG,CAAiB;IAC9C,GAAG,4BAA4B,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,8BAA8B,CAAC,KAAK,CAAE,CAAU,CAAC;IACzG,GAAG,sBAAsB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,wBAAwB,CAAC,KAAK,CAAE,CAAU,CAAC;CAC9F,CAAC,CAAA;AAEF,sFAAsF;AACtF,MAAM,UAAU,yBAAyB,CAAC,SAA6D;IACrG,MAAM,UAAU,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,UAAU,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;QAC1E,MAAM,YAAY,GAAG,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;QACtD,IAAI,YAAY,KAAK,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,4CAA4C,SAAS,CAAC,EAAE,EAAE,CAAC,CAAA;QAC3G,MAAM,SAAS,GAAG,SAAS,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,kCAAkC,CAAA;QAChH,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,CAAA;IACpC,CAAC,CAAC,CAAA;IACF,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC;QACtE,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;KACtC,CAAC,CAAA;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,QAA2B,EAAE,YAAoB,EAAE,eAAkC,EAAE,UAAyC,EAAE,SAA6C,EAAE,sBAA+B;IACnO,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,KAAK,OAAO,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,KAAK,WAAW;QAAE,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAA;IACrJ,IAAI,QAAQ,CAAC,UAAU,KAAK,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,oEAAoE,CAAC,CAAA;IAC5H,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAA;IACvC,MAAM,MAAM,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAmB,EAAE,CAAC,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IAC7I,yEAAyE;IACzE,wEAAwE;IACxE,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,EAAE,CAAA;IACpC,MAAM,UAAU,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YACzE,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,CAAA;YACzB,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,IAAI,CAAA;YACtC,IAAI,IAAI,KAAK,QAAQ;gBAAE,OAAO,EAAE,CAAA;YAChC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,QAAQ,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,QAAQ,MAAM,CAAC;gBAAE,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,CAAA;YAC1H,OAAO,IAAI,CAAA;QACb,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;IAC7B,MAAM,SAAS,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACvC,MAAM,IAAI,GAAG,sBAAsB;QACjC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,sBAAsB,SAAS,EAAE,CAAC;QACnE,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,KAAK,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,YAAY,0BAA0B,SAAS,EAAE,CAAC,CAAA;IAChI,OAAO;QACL,IAAI;QACJ,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM;QACpC,UAAU,EAAE,SAAS;QACrB,YAAY,EAAE,QAAQ,CAAC,YAAY;QACnC,OAAO,EAAE,QAAQ,CAAC,OAAO;QACzB,GAAG,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC;QACjD,eAAe;QACf,UAAU;KACX,CAAA;AACH,CAAC;AAED,4EAA4E;AAC5E,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,KAWtC;IACC,MAAM,mBAAmB,GAAG,KAAK,CAAC,OAAO,KAAK,SAAS,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,KAAK,IAAI;QACxF,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,KAAK,EAAE,IAAkE,EAAiB,EAAE;YAC5F,MAAM,KAAK,CAAC,OAAQ,CAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,EAAE;gBAC7C,MAAM,KAAK,GAAG,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAA;gBACzG,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;oBAC9G,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAA;gBACtE,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAA;IACH,MAAM,OAAO,GAAG,MAAM,sBAAsB,CAAC;QAC3C,GAAG,WAAW,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,eAAe,IAAI,EAAE,EAAE,KAAK,CAAC,UAAU,IAAI,EAAE,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,sBAAsB,KAAK,IAAI,CAAC;QACvJ,GAAG,CAAC,KAAK,CAAC,kBAAkB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,kBAAkB,EAAE,KAAK,CAAC,kBAAkB,EAAE,CAAC;QACnG,GAAG,CAAC,KAAK,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,KAAK,CAAC,gBAAgB,EAAE,CAAC;QAC7F,GAAG,CAAC,mBAAmB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC;KACtE,CAAC,CAAA;IACF,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;QACzD,IAAI,EAAE,MAAe;QACrB,OAAO,EAAE,MAAM,CAAC,IAAI;QACpB,MAAM,EAAE,MAAM,CAAC,IAAI;QACnB,IAAI,EAAE,MAAM,CAAC,IAAI;KAClB,CAAC,CAAC,CAAC,CAAA;AACN,CAAC"}

package/dist/dsh/context-projection.d.ts

@@ -0,0 +1,18 @@
+import type { DshModelMessage } from './context-injection.js';
+import type { DshLogEvent } from './session-memory-finalizer.js';
+interface ContextSession {
+    readonly surface?: {
+        readonly nodes: readonly number[];
+    };
+    readonly eventAt?: (seq: number) => DshLogEvent | undefined;
+    readonly snapshotEvents?: () => readonly DshLogEvent[];
+}
+/**
+ * Emit only changed named fragments. Delivery is proven by the native surface
+ * or the current claimed/queued batch, never by an earlier projection attempt.
+ * Rebuilding from the surface also restores needed fragments after compaction,
+ * resume, or plugin reload without a second persistence/cache owner.
+ */
+export declare function projectDshContext(messages: readonly DshModelMessage[], session: ContextSession, pending?: readonly unknown[]): readonly unknown[];
+export {};
+//# sourceMappingURL=context-projection.d.ts.map

package/dist/dsh/context-projection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"context-projection.d.ts","sourceRoot":"","sources":["../../src/dsh/context-projection.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAEhE,UAAU,cAAc;IACtB,QAAQ,CAAC,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,CAAA;IACxD,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,WAAW,GAAG,SAAS,CAAA;IAC3D,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,SAAS,WAAW,EAAE,CAAA;CACvD;AA6BD;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,SAAS,eAAe,EAAE,EACpC,OAAO,EAAE,cAAc,EACvB,OAAO,GAAE,SAAS,OAAO,EAAO,GAC/B,SAAS,OAAO,EAAE,CA4BpB"}

package/dist/dsh/context-projection.js

@@ -0,0 +1,68 @@
+import { randomUUID } from 'node:crypto';
+function record(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value)
+        ? value : undefined;
+}
+/** Read retained messages, excluding chunk history and compacted-away instructions. */
+function retainedEvents(session) {
+    if (session.surface !== undefined && session.eventAt !== undefined) {
+        return session.surface.nodes.flatMap(seq => {
+            const event = session.eventAt(seq);
+            return event === undefined ? [] : [event];
+        });
+    }
+    const nodes = [];
+    for (const event of session.snapshotEvents?.() ?? []) {
+        if (event.surfaceOp === 'append')
+            nodes.push(event);
+        else if (event.surfaceOp !== undefined) {
+            const replacement = event.surfaceOp;
+            const start = nodes.findIndex(node => node.seq === replacement.start);
+            const end = nodes.findIndex(node => node.seq === replacement.end);
+            if (start < 0 || end < start)
+                throw new Error('Kiokuko context projection encountered an invalid session replacement');
+            nodes.splice(start, end - start + 1, event);
+        }
+    }
+    return nodes;
+}
+/**
+ * Emit only changed named fragments. Delivery is proven by the native surface
+ * or the current claimed/queued batch, never by an earlier projection attempt.
+ * Rebuilding from the surface also restores needed fragments after compaction,
+ * resume, or plugin reload without a second persistence/cache owner.
+ */
+export function projectDshContext(messages, session, pending = []) {
+    const latest = new Map();
+    for (const value of [
+        ...retainedEvents(session).filter(event => event.type === 'user/message').map(event => event.data),
+        ...pending,
+    ]) {
+        const message = record(value);
+        const source = record(message?.source);
+        if (message?.role !== 'user' || source?.kind !== 'plugin' || source.plugin !== 'kiokuko-dsh'
+            || source.form !== 'snapshot' || !Array.isArray(source.sections) || source.sections.length !== 1)
+            continue;
+        const section = record(source.sections[0]);
+        const content = message.content;
+        if (typeof section?.name !== 'string' || typeof section.text !== 'string'
+            || !Array.isArray(content) || content.length !== 1)
+            continue;
+        const block = record(content[0]);
+        if (block?.type === 'text' && block.text === section.text)
+            latest.set(section.name, section.text);
+    }
+    return messages.flatMap(message => {
+        const name = `${message.source}:${message.name}`;
+        if (latest.get(name) === message.content)
+            return [];
+        latest.set(name, message.content);
+        return [{
+                id: randomUUID(),
+                role: message.role,
+                content: [{ type: 'text', text: message.content }],
+                source: { kind: 'plugin', plugin: 'kiokuko-dsh', form: 'snapshot', sections: [{ name, text: message.content }] },
+            }];
+    });
+}
+//# sourceMappingURL=context-projection.js.map

package/dist/dsh/context-projection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"context-projection.js","sourceRoot":"","sources":["../../src/dsh/context-projection.ts"],"names":[],"mappings":"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"}

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;AAmG3G,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;AAoOD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,GAAE,qBAA0B,GAAG,cAAc,CA+yDtG;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;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"}

package/dist/dsh/host-adapter.js

@@ -1,6 +1,5 @@
 import { fileURLToPath } from 'node:url';
 import { realpathSync } from 'node:fs';
-import { randomUUID } from 'node:crypto';
 import { KIOKUKO_DSH_HOST_SERVICE, } from './composition.js';
 import { DshRuntime } from './runtime.js';
 import { withImmediateTransaction } from '../db/transaction.js';
@@ -22,6 +21,7 @@ import { STANDARD_SKILL_MANIFESTS } from './standard-skills.js';
 import { canonicalContentHash, compareCanonicalStrings } from '../serialization/validate.js';
 import { KiokukoError } from '../errors.js';
 import { injectDshContext, selectDshDirectiveSources } from './context-injection.js';
+import { projectDshContext } from './context-projection.js';
 import { projectDshDirective } from './directive-projection.js';
 import { submitOdunoIdeal, submitEnnoPlan, submitEnnoAdvice, readPendingEnnoAdvice, reportEnnoWork, finishEnno, submitOdunoMeditation, answerEnno, prepareEnnoVerification, stateForSnapshot, inapplicableEnnoState } from '../enno-oduno/service.js';
 import { claimExecutionLeaseInTransaction, readEnnoSnapshot, terminalizeLedgerRunInTransaction } from '../enno-oduno/store.js';
@@ -758,7 +758,7 @@ export function createDshHostAdapter(ctx, options = {}) {
                             return { kind: 'reject' };
                     }
                 }
-                const messages = await contextMessages(event, result);
+                const messages = await contextMessages(event, nativeDecision.messages);
                 return { ...nativeDecision, messages: [...executionSupport.projectMessages(event.sessionId, nativeDecision.messages), ...messages] };
             }
             catch {
@@ -788,16 +788,6 @@ export function createDshHostAdapter(ctx, options = {}) {
         const item = currentSession(sessionId);
         return item?.agentId === agentId && (turn === undefined || item.turn === turn) && matchesNativeIdentity(item) ? item : undefined;
     };
-    const contextInjectionKey = (item, turn, state, selection) => canonicalContentHash({
-        sessionId: item.sessionId,
-        turn,
-        routeSkillNames: selection.routeSkillNames,
-        expertRefs: selection.expertRefs,
-        contractRevision: state.contractRevision,
-        nextAction: state.nextAction,
-        directiveDigest: state.directive === null ? null : canonicalContentHash(state.directive),
-        advisoryRoundDigest: state.advisoryPhaseState.state === 'aggregated' ? state.advisoryPhaseState.inputDigest : null,
-    });
     const advisoryEvidenceFor = async (item, state) => {
         const advisoryState = state.advisoryPhaseState;
         const contractRevision = state.contractRevision;
@@ -973,7 +963,7 @@ export function createDshHostAdapter(ctx, options = {}) {
             signal: payload.signal,
         };
     };
-    const contextMessages = async (event, _result) => {
+    const contextMessages = async (event, pending) => {
         const item = currentForAgentEvent(event.agent.id, event.sessionId, event.turn, event.nativeSession, event.nativeAgent);
         if (item === undefined || item.sessionId !== event.sessionId)
             throw new Error('kiokuko-dsh turn identity is not bound');
@@ -986,9 +976,6 @@ export function createDshHostAdapter(ctx, options = {}) {
         const prepared = item.prepared;
         const directive = projectDshDirective(prepared.ennoOduno);
         const selection = directive === null ? { routeSkillNames: [], expertRefs: [] } : selectDshDirectiveSources(directive);
-        const contextKey = contextInjectionKey(item, event.turn, prepared.ennoOduno, selection);
-        if (item.contextInjectionKey === contextKey)
-            return [];
         const advisoryEvidence = await advisoryEvidenceFor(item, prepared.ennoOduno);
         const messages = await injectDshContext({
             prepared,
@@ -998,15 +985,10 @@ export function createDshHostAdapter(ctx, options = {}) {
             ...(directive === null ? {} : { directive }),
             ...(advisoryEvidence === undefined ? {} : { advisoryEvidence }),
             runtime,
+            soulInSystemPrompt: ctx.get('systemPrompt', false) !== undefined,
+            userTaskInConversation: true,
         });
-        const nativeMessages = messages.map((message) => ({
-            id: randomUUID(),
-            role: message.role,
-            content: [{ type: 'text', text: message.content }],
-            source: { kind: 'plugin', plugin: 'kiokuko-dsh', form: 'instructions' },
-        }));
-        item.contextInjectionKey = contextKey;
-        return Object.freeze(nativeMessages);
+        return projectDshContext(messages, sessionEventSource(event.nativeSession), pending);
     };
     const toolHost = {
         bind: (execution) => {
@@ -1368,9 +1350,6 @@ export function createDshHostAdapter(ctx, options = {}) {
         const agent = exactNativeAgent === undefined ? agents?.get(item.agentId) : exactNativeAgent;
         if (agent?.inject === undefined)
             throw new Error('kiokuko-dsh native agent injection is unavailable');
-        const contextKey = contextInjectionKey(item, item.turn, state, selection);
-        if (item.contextInjectionKey === contextKey)
-            return;
         const projectedDirective = projectDshDirective({ nextAction: state.nextAction, directive: state.directive });
         const advisoryEvidence = await advisoryEvidenceFor(item, state);
         const messages = await injectDshContext({
@@ -1381,12 +1360,14 @@ export function createDshHostAdapter(ctx, options = {}) {
             ...(projectedDirective === null ? {} : { directive: projectedDirective }),
             ...(advisoryEvidence === undefined ? {} : { advisoryEvidence }),
             runtime,
+            soulInSystemPrompt: ctx.get('systemPrompt', false) !== undefined,
+            userTaskInConversation: true,
         });
         event.signal.throwIfAborted();
-        for (const message of messages) {
-            agent.inject({ id: randomUUID(), role: 'user', content: [{ type: 'text', text: message.content }], source: { kind: 'plugin', plugin: 'kiokuko-dsh', form: 'instructions' } });
+        const pending = agent.inbox?.nextStep ?? [];
+        for (const message of projectDshContext(messages, sessionEventSource(item.nativeSession), pending)) {
+            agent.inject(message);
         }
-        item.contextInjectionKey = contextKey;
     };
     const runFinalVerificationBoundary = async (item) => {
         await assertTurnBoundary(boundaryEvent(item));