ticlawk 0.1.16-dev.15 → 0.1.16-dev.16

package/src/runtimes/codex/index.mjs

@@ -26,6 +26,8 @@ import {
   terminalRuntimeFailure,
   updateBindingRuntimeMeta,
   isRuntimeGatewayFailure,
+  resolveRuntimeSessionScope,
+  buildRuntimeSessionMetaPatch,
 } from '../../core/runtime-support.mjs';
 import { buildAgentRuntimeEnv } from '../../core/runtime-env.mjs';
 import { buildStandingPrompt } from '../_shared/standing-prompt.mjs';
@@ -140,14 +142,16 @@ export const codexRuntime = {
       ? (codexInput.find((item) => item?.type === 'text')?.text || inbound.text || '(image attached)')
       : inbound.text;
 
-    const shouldRotate = !meta.sessionId || meta.rotatePending;
+    const sessionScope = resolveRuntimeSessionScope(meta, inbound);
+    const shouldRotate = sessionScope.shouldRotate;
+    const targetSessionId = shouldRotate ? null : sessionScope.sessionId;
     const deltaAggregator = createDeltaAggregator({
       flushDelta: async ({ text, sessionId, turnId, cwd }) => {
         await emitWorkerEvent({
           adapter,
           binding,
           agent: this.name,
-          sessionId: sessionId || meta.sessionId || binding.id,
+          sessionId: sessionId || targetSessionId || binding.id,
           turnId: turnId || null,
           cwd: cwd || agentHome,
           replyToMessageId: inbound.messageId || null,
@@ -165,12 +169,15 @@ export const codexRuntime = {
       const runtimeCodexVersion = getCodexRuntimeHealth(runtimeCodexPath).version || meta.codexVersion || null;
       const agentEnv = buildAgentRuntimeEnv({
         agentId: binding.id,
-        sessionId: meta.sessionId,
+        sessionId: targetSessionId,
         hostId: binding.runtime_host_id,
+        conversationId: inbound.conversationId,
+        messageId: inbound.messageId,
+        target: inbound.envelopeTarget,
       });
-      const developerInstructions = buildStandingPrompt({ agentId: binding.id });
+      const developerInstructions = buildStandingPrompt({ agentId: binding.id, inbound });
       const result = (shouldRotate || inbound.action === 'image' || shouldStreamRuntime(this.name, this))
-        ? await this.runTurnStream({ sessionId: shouldRotate ? null : meta.sessionId, cwd: agentHome, codexPath: runtimeCodexPath, agentEnv }, message, {
+        ? await this.runTurnStream({ sessionId: targetSessionId, cwd: agentHome, codexPath: runtimeCodexPath, agentEnv }, message, {
             input: codexInput,
             developerInstructions,
             onEvent: async (event) => {
@@ -179,7 +186,7 @@ export const codexRuntime = {
                   adapter,
                   binding,
                   agent: this.name,
-                  sessionId: event.sessionId || meta.sessionId || binding.id,
+                  sessionId: event.sessionId || targetSessionId || binding.id,
                   turnId: event.turnId || null,
                   cwd: agentHome,
                   replyToMessageId: inbound.messageId || null,
@@ -191,32 +198,32 @@ export const codexRuntime = {
                 });
               } else if (event?.type === 'message.delta' && event.text) {
                 deltaAggregator.push(event.text, {
-                  sessionId: event.sessionId || meta.sessionId || binding.id,
+                  sessionId: event.sessionId || targetSessionId || binding.id,
                   turnId: event.turnId || null,
                   cwd: agentHome,
                 });
               }
             },
           })
-        : await this.runTurn({ sessionId: meta.sessionId, cwd: agentHome, codexPath: runtimeCodexPath, agentEnv }, message, {
+        : await this.runTurn({ sessionId: targetSessionId, cwd: agentHome, codexPath: runtimeCodexPath, agentEnv }, message, {
             input: codexInput,
           });
 
       await deltaAggregator.flush();
       const nextBinding = await updateBindingRuntimeMeta(ctx, binding, {
-        sessionId: result?.sessionId || meta.sessionId,
-        path: result?.path || meta.path || null,
+        ...buildRuntimeSessionMetaPatch(meta, sessionScope, {
+          sessionId: result?.sessionId,
+          path: result?.path,
+        }),
         runtimePath: runtimeCodexPath,
         codexPath: runtimeCodexPath,
         codexVersion: runtimeCodexVersion,
-        rotatePending: false,
-        lastRotatedAt: shouldRotate ? new Date().toISOString() : meta.lastRotatedAt,
       }, { status: 'connected' });
       await emitWorkerEvent({
         adapter,
         binding: nextBinding,
         agent: this.name,
-        sessionId: result?.sessionId || meta.sessionId || binding.id,
+        sessionId: result?.sessionId || targetSessionId || binding.id,
         turnId: result?.turnId || null,
         cwd: result?.cwd || agentHome,
         replyToMessageId: inbound.messageId || null,
@@ -247,7 +254,7 @@ export const codexRuntime = {
         adapter,
         binding: failureBinding,
         agent: this.name,
-        sessionId: meta.sessionId || binding.id,
+        sessionId: targetSessionId || binding.id,
         turnId: failureInfo?.turnId || null,
         cwd: agentHome,
         replyToMessageId: inbound.messageId || null,

package/src/runtimes/openclaw/index.mjs

@@ -1,4 +1,5 @@
 import { reportSubprocessFailure, terminalRuntimeFailure } from '../../core/runtime-support.mjs';
+import { getGoalTaskProtocolOverlayKey } from '../_shared/goal-task-protocol.mjs';
 import { buildStandingPrompt } from '../_shared/standing-prompt.mjs';
 import { GATEWAY_HOST, GATEWAY_PORT } from './identity.mjs';
 
@@ -24,10 +25,11 @@ async function probeOpenClawGatewayHealth() {
 import { buildOpenClawSessionKey, normalizeOpenClawAgentId } from './target.mjs';
 import { askGateway, isGatewayReady, registerOpenClawChannel } from './gateway.mjs';
 
-// Tracks which (agentId, sessionKey) pairs already saw the standing
-// prompt this process lifetime. OpenClaw's gateway holds session state
-// out of process, so we err on the side of "inject on first observed
-// turn after daemon restart"; the gateway dedupes redundant context.
+// Tracks which (agentId, sessionKey, protocol overlay) combinations
+// already saw the standing prompt this process lifetime. OpenClaw's
+// gateway holds session state out of process, so we err on the side of
+// "inject on first observed overlay after daemon restart"; the gateway
+// dedupes redundant context.
 const standingPromptSeen = new Set();
 import { addInFlight, recoverInFlightEntries, removeInFlight } from './inflight.mjs';
 import { existsSync, mkdirSync, writeFileSync } from 'node:fs';
@@ -159,13 +161,13 @@ export const openClawRuntime = {
     const sessionId = String(meta.sessionKey || buildOpenClawSessionKey(agentId)).trim();
 
     // Inject the standing prompt on the first observed turn after a
-    // daemon start for this (agent, session) pair. OpenClaw has no
-    // separate "system prompt" parameter on the gateway, so we prepend
-    // exactly once.
-    const standingKey = `${agentId}|${sessionId}`;
+    // daemon start for this (agent, session, protocol overlay). OpenClaw
+    // has no separate "system prompt" parameter on the gateway, so we
+    // prepend through the prompt body.
+    const standingKey = `${agentId}|${sessionId}|${getGoalTaskProtocolOverlayKey({ agentId: binding.id, inbound })}`;
     let prompt = rawPrompt;
     if (!standingPromptSeen.has(standingKey)) {
-      const standing = buildStandingPrompt({ agentId: binding.id });
+      const standing = buildStandingPrompt({ agentId: binding.id, inbound });
       prompt = `${standing}\n\n---\n\n${rawPrompt}`;
       standingPromptSeen.add(standingKey);
     }

package/src/runtimes/opencode/index.mjs

@@ -10,6 +10,7 @@
 import { existsSync } from 'node:fs';
 import { basename } from 'node:path';
 import { buildAgentRuntimeEnv } from '../../core/runtime-env.mjs';
+import { getGoalTaskProtocolOverlayKey } from '../_shared/goal-task-protocol.mjs';
 import { buildStandingPrompt } from '../_shared/standing-prompt.mjs';
 import { ensureAgentHome } from '../../core/agent-home.mjs';
 import {
@@ -31,8 +32,12 @@ import {
   reportSubprocessFailure,
   terminalRuntimeFailure,
   updateBindingRuntimeMeta,
+  resolveRuntimeSessionScope,
+  buildRuntimeSessionMetaPatch,
 } from '../../core/runtime-support.mjs';
 
+const standingPromptSeen = new Set();
+
 export const openCodeRuntime = {
   name: 'opencode',
 
@@ -48,6 +53,7 @@ export const openCodeRuntime = {
       opencodePath,
       agentEnv,
       standingPrompt: opts.standingPrompt || null,
+      forceStandingPrompt: Boolean(opts.forceStandingPrompt),
       files: opts.files,
       timeoutMs: opts.timeoutMs,
     });
@@ -61,6 +67,7 @@ export const openCodeRuntime = {
       opencodePath,
       agentEnv,
       standingPrompt: opts.standingPrompt || null,
+      forceStandingPrompt: Boolean(opts.forceStandingPrompt),
       files: opts.files,
       timeoutMs: opts.timeoutMs,
       onEvent: opts.onEvent,
@@ -156,7 +163,9 @@ export const openCodeRuntime = {
       // instruction so it has something to anchor on.
       message = captionText || 'Please analyze the attached image(s).';
     }
-    const shouldRotate = !meta.sessionId || meta.rotatePending;
+    const sessionScope = resolveRuntimeSessionScope(meta, inbound);
+    const shouldRotate = sessionScope.shouldRotate;
+    const targetSessionId = shouldRotate ? null : sessionScope.sessionId;
 
     const deltaAggregator = createDeltaAggregator({
       flushDelta: async ({ text, sessionId, cwd }) => {
@@ -164,7 +173,7 @@ export const openCodeRuntime = {
           adapter,
           binding,
           agent: this.name,
-          sessionId: sessionId || meta.sessionId || binding.id,
+          sessionId: sessionId || targetSessionId || binding.id,
           cwd: cwd || agentHome,
           replyToMessageId: inbound.messageId || null,
           event: {
@@ -182,13 +191,22 @@ export const openCodeRuntime = {
       const opencodeVersion = getOpenCodeRuntimeHealth(opencodePath).version || meta.opencodeVersion || null;
       const agentEnv = buildAgentRuntimeEnv({
         agentId: binding.id,
-        sessionId: meta.sessionId,
+        sessionId: targetSessionId,
         hostId: binding.runtime_host_id,
+        conversationId: inbound.conversationId,
+        messageId: inbound.messageId,
+        target: inbound.envelopeTarget,
       });
-      const standingPrompt = buildStandingPrompt({ agentId: binding.id });
+      const standingPrompt = buildStandingPrompt({ agentId: binding.id, inbound });
+      const protocolOverlayKey = getGoalTaskProtocolOverlayKey({ agentId: binding.id, inbound });
+      const standingPromptSeenKey = targetSessionId
+        ? `${binding.id}|${targetSessionId}|${protocolOverlayKey}`
+        : null;
+      const forceStandingPrompt = Boolean(standingPromptSeenKey && !standingPromptSeen.has(standingPromptSeenKey));
       const result = shouldStreamRuntime(this.name, this)
-        ? await this.runTurnStream({ sessionId: shouldRotate ? null : meta.sessionId, cwd: agentHome, opencodePath, agentEnv }, message, {
+        ? await this.runTurnStream({ sessionId: targetSessionId, cwd: agentHome, opencodePath, agentEnv }, message, {
             standingPrompt,
+            forceStandingPrompt,
             files,
             onEvent: async (event) => {
               if (event?.type === 'turn.started') {
@@ -196,7 +214,7 @@ export const openCodeRuntime = {
                   adapter,
                   binding,
                   agent: this.name,
-                  sessionId: event.sessionId || meta.sessionId || binding.id,
+                  sessionId: event.sessionId || targetSessionId || binding.id,
                   cwd: agentHome,
                   replyToMessageId: inbound.messageId || null,
                   event: {
@@ -207,29 +225,34 @@ export const openCodeRuntime = {
                 });
               } else if (event?.type === 'message.delta' && event.text) {
                 deltaAggregator.push(event.text, {
-                  sessionId: event.sessionId || meta.sessionId || binding.id,
+                  sessionId: event.sessionId || targetSessionId || binding.id,
                   cwd: agentHome,
                 });
               }
             },
           })
-        : await this.runTurn({ sessionId: shouldRotate ? null : meta.sessionId, cwd: agentHome, opencodePath, agentEnv }, message, { files, standingPrompt });
+        : await this.runTurn({ sessionId: targetSessionId, cwd: agentHome, opencodePath, agentEnv }, message, { files, standingPrompt, forceStandingPrompt });
 
       await deltaAggregator.flush();
+      const observedSessionId = result?.sessionId || targetSessionId;
+      if (observedSessionId) {
+        standingPromptSeen.add(`${binding.id}|${observedSessionId}|${protocolOverlayKey}`);
+      }
 
       const nextBinding = await updateBindingRuntimeMeta(ctx, binding, {
-        sessionId: result?.sessionId || meta.sessionId,
+        ...buildRuntimeSessionMetaPatch(meta, sessionScope, {
+          sessionId: result?.sessionId,
+          path: result?.path,
+        }),
         runtimePath: opencodePath,
         opencodePath,
         opencodeVersion,
-        rotatePending: false,
-        lastRotatedAt: shouldRotate ? new Date().toISOString() : meta.lastRotatedAt,
       }, { status: 'connected' });
       await emitWorkerEvent({
         adapter,
         binding: nextBinding,
         agent: this.name,
-        sessionId: result?.sessionId || meta.sessionId || binding.id,
+        sessionId: result?.sessionId || targetSessionId || binding.id,
         cwd: result?.cwd || agentHome,
         replyToMessageId: inbound.messageId || null,
         event: {
@@ -245,7 +268,7 @@ export const openCodeRuntime = {
         adapter,
         binding,
         agent: this.name,
-        sessionId: meta.sessionId || binding.id,
+        sessionId: targetSessionId || binding.id,
         cwd: agentHome,
         replyToMessageId: inbound.messageId || null,
         event: {

package/src/runtimes/opencode/session.mjs

@@ -210,14 +210,15 @@ export function runOpenCodePrompt({
   opencodePath = null,
   agentEnv = null,
   standingPrompt = null,
+  forceStandingPrompt = false,
   timeoutMs = Number(process.env.OPENCODE_RUN_TIMEOUT_MS || DEFAULT_OPENCODE_RUN_TIMEOUT_MS),
   onEvent,
 }) {
   // opencode has no documented `--system` flag, so we prepend the
-  // standing prompt to the first-turn message body. Resumed sessions
-  // (sessionId set) skip injection because the model already saw it
-  // on the originating turn.
-  const finalMessage = standingPrompt && !sessionId
+  // standing prompt to the first-turn message body. Callers may force a
+  // resumed-session injection when the selected protocol overlay changes
+  // or this daemon process has not yet observed the session.
+  const finalMessage = standingPrompt && (!sessionId || forceStandingPrompt)
     ? `${standingPrompt}\n\n---\n\n${message}`
     : message;
   return new Promise((resolve, reject) => {

package/src/runtimes/pi/index.mjs

@@ -6,6 +6,7 @@
 
 import { basename } from 'node:path';
 import { buildAgentRuntimeEnv } from '../../core/runtime-env.mjs';
+import { getGoalTaskProtocolOverlayKey } from '../_shared/goal-task-protocol.mjs';
 import { buildStandingPrompt } from '../_shared/standing-prompt.mjs';
 import { ensureAgentHome } from '../../core/agent-home.mjs';
 import {
@@ -25,8 +26,12 @@ import {
   reportSubprocessFailure,
   terminalRuntimeFailure,
   updateBindingRuntimeMeta,
+  resolveRuntimeSessionScope,
+  buildRuntimeSessionMetaPatch,
 } from '../../core/runtime-support.mjs';
 
+const standingPromptSeen = new Set();
+
 export const piRuntime = {
   name: 'pi',
 
@@ -39,6 +44,7 @@ export const piRuntime = {
       piPath,
       agentEnv,
       standingPrompt: opts.standingPrompt || null,
+      forceStandingPrompt: Boolean(opts.forceStandingPrompt),
       timeoutMs: opts.timeoutMs,
     });
   },
@@ -52,6 +58,7 @@ export const piRuntime = {
       piPath,
       agentEnv,
       standingPrompt: opts.standingPrompt || null,
+      forceStandingPrompt: Boolean(opts.forceStandingPrompt),
       timeoutMs: opts.timeoutMs,
       onEvent: opts.onEvent,
     });
@@ -128,14 +135,16 @@ export const piRuntime = {
       message = captionText || 'Please analyze the attached image(s).';
     }
 
-    const shouldRotate = !meta.sessionId || meta.rotatePending;
+    const sessionScope = resolveRuntimeSessionScope(meta, inbound);
+    const shouldRotate = sessionScope.shouldRotate;
+    const targetSessionId = shouldRotate ? null : sessionScope.sessionId;
     const deltaAggregator = createDeltaAggregator({
       flushDelta: async ({ text, sessionId, cwd }) => {
         await emitWorkerEvent({
           adapter,
           binding,
           agent: this.name,
-          sessionId: sessionId || meta.sessionId || binding.id,
+          sessionId: sessionId || targetSessionId || binding.id,
           cwd: cwd || agentHome,
           replyToMessageId: inbound.messageId || null,
           event: {
@@ -153,13 +162,22 @@ export const piRuntime = {
       const runtimePiVersion = getPiRuntimeHealth(runtimePiPath).version || meta.piVersion || null;
       const agentEnv = buildAgentRuntimeEnv({
         agentId: binding.id,
-        sessionId: meta.sessionId,
+        sessionId: targetSessionId,
         hostId: binding.runtime_host_id,
+        conversationId: inbound.conversationId,
+        messageId: inbound.messageId,
+        target: inbound.envelopeTarget,
       });
-      const standingPrompt = buildStandingPrompt({ agentId: binding.id });
+      const standingPrompt = buildStandingPrompt({ agentId: binding.id, inbound });
+      const protocolOverlayKey = getGoalTaskProtocolOverlayKey({ agentId: binding.id, inbound });
+      const standingPromptSeenKey = targetSessionId
+        ? `${binding.id}|${targetSessionId}|${protocolOverlayKey}`
+        : null;
+      const forceStandingPrompt = Boolean(standingPromptSeenKey && !standingPromptSeen.has(standingPromptSeenKey));
       const result = shouldStreamRuntime(this.name, this)
-        ? await this.runTurnStream({ sessionId: shouldRotate ? null : meta.sessionId, cwd: agentHome, piPath: runtimePiPath, agentEnv }, message, {
+        ? await this.runTurnStream({ sessionId: targetSessionId, cwd: agentHome, piPath: runtimePiPath, agentEnv }, message, {
             standingPrompt,
+            forceStandingPrompt,
             images,
             onEvent: async (event) => {
               if (event?.type === 'turn.started') {
@@ -167,7 +185,7 @@ export const piRuntime = {
                   adapter,
                   binding,
                   agent: this.name,
-                  sessionId: event.sessionId || meta.sessionId || binding.id,
+                  sessionId: event.sessionId || targetSessionId || binding.id,
                   cwd: agentHome,
                   replyToMessageId: inbound.messageId || null,
                   event: {
@@ -178,29 +196,33 @@ export const piRuntime = {
                 });
               } else if (event?.type === 'message.delta' && event.text) {
                 deltaAggregator.push(event.text, {
-                  sessionId: event.sessionId || meta.sessionId || binding.id,
+                  sessionId: event.sessionId || targetSessionId || binding.id,
                   cwd: agentHome,
                 });
               }
             },
           })
-        : await this.runTurn({ sessionId: shouldRotate ? null : meta.sessionId, cwd: agentHome, piPath: runtimePiPath, agentEnv }, message, { images, standingPrompt });
+        : await this.runTurn({ sessionId: targetSessionId, cwd: agentHome, piPath: runtimePiPath, agentEnv }, message, { images, standingPrompt, forceStandingPrompt });
 
       await deltaAggregator.flush();
+      const observedSessionId = result?.sessionId || targetSessionId;
+      if (observedSessionId) {
+        standingPromptSeen.add(`${binding.id}|${observedSessionId}|${protocolOverlayKey}`);
+      }
       const nextBinding = await updateBindingRuntimeMeta(ctx, binding, {
-        sessionId: result?.sessionId || meta.sessionId,
-        path: result?.path || meta.path || null,
+        ...buildRuntimeSessionMetaPatch(meta, sessionScope, {
+          sessionId: result?.sessionId,
+          path: result?.path,
+        }),
         runtimePath: runtimePiPath,
         piPath: runtimePiPath,
         piVersion: runtimePiVersion,
-        rotatePending: false,
-        lastRotatedAt: shouldRotate ? new Date().toISOString() : meta.lastRotatedAt,
       }, { status: 'connected' });
       await emitWorkerEvent({
         adapter,
         binding: nextBinding,
         agent: this.name,
-        sessionId: result?.sessionId || meta.sessionId || binding.id,
+        sessionId: result?.sessionId || targetSessionId || binding.id,
         cwd: result?.cwd || agentHome,
         replyToMessageId: inbound.messageId || null,
         event: {
@@ -216,7 +238,7 @@ export const piRuntime = {
         adapter,
         binding,
         agent: this.name,
-        sessionId: meta.sessionId || binding.id,
+        sessionId: targetSessionId || binding.id,
         cwd: agentHome,
         replyToMessageId: inbound.messageId || null,
         event: {

package/src/runtimes/pi/session.mjs

@@ -197,11 +197,14 @@ export function runPiPrompt({
   piPath = null,
   agentEnv = null,
   standingPrompt = null,
+  forceStandingPrompt = false,
   timeoutMs = Number(process.env.PI_RUN_TIMEOUT_MS || DEFAULT_PI_RUN_TIMEOUT_MS),
   onEvent,
 }) {
-  // pi has no documented system-prompt flag — prepend on first turn.
-  const finalMessage = standingPrompt && !sessionId
+  // pi has no documented system-prompt flag. Prepend on first turn, and
+  // let callers force one resumed-session injection for a newly selected
+  // protocol overlay.
+  const finalMessage = standingPrompt && (!sessionId || forceStandingPrompt)
     ? `${standingPrompt}\n\n---\n\n${message}`
     : message;
   return new Promise((resolve, reject) => {