Add delegation timestamp and refresh worktree hints

Author: dmoliveira

plugin/gateway-core/dist/hooks/agent-context-shaper/index.js

@@ -35,6 +35,7 @@ function buildHint(context) {
     ].join("\n");
 }
 function buildTaskFocusReminder(context) {
+    const delegatedAt = new Date().toISOString();
     const trigger = Array.isArray(context.metadata.triggers) &&
         context.metadata.triggers.length > 0
         ? context.metadata.triggers[0]
@@ -47,6 +48,7 @@ function buildTaskFocusReminder(context) {
         "[agent-context-shaper] delegated task focus",
         `- subagent: ${context.subagentType}`,
         `- category: ${context.category}`,
+        `- delegated_at: ${delegatedAt}`,
         "- execute one delegated objective for this task call before returning control",
         `- prioritize: ${trigger}`,
         `- avoid: ${avoid}`,

plugin/gateway-core/dist/hooks/agent-model-resolver/index.js

@@ -131,6 +131,7 @@ function stripInjectedHeaders(original) {
         "MODEL ROUTING",
         "TOOL SURFACE",
         "SESSION FLOW",
+        "WORKTREE CONTEXT",
         "THINKING EFFORT",
     ]
         .reduce((text, header) => stripHeaderLine(text, header), original)

plugin/gateway-core/src/hooks/agent-context-shaper/index.ts

@@ -111,6 +111,7 @@ function buildHint(context: StoredContext): string {
 }
 
 function buildTaskFocusReminder(context: StoredContext): string {
+  const delegatedAt = new Date().toISOString();
   const trigger =
     Array.isArray(context.metadata.triggers) &&
     context.metadata.triggers.length > 0
@@ -125,6 +126,7 @@ function buildTaskFocusReminder(context: StoredContext): string {
     "[agent-context-shaper] delegated task focus",
     `- subagent: ${context.subagentType}`,
     `- category: ${context.category}`,
+    `- delegated_at: ${delegatedAt}`,
     "- execute one delegated objective for this task call before returning control",
     `- prioritize: ${trigger}`,
     `- avoid: ${avoid}`,

plugin/gateway-core/src/hooks/agent-model-resolver/index.ts

@@ -166,6 +166,7 @@ function stripInjectedHeaders(original: string): string {
     "MODEL ROUTING",
     "TOOL SURFACE",
     "SESSION FLOW",
+    "WORKTREE CONTEXT",
     "THINKING EFFORT",
   ]
     .reduce((text, header) => stripHeaderLine(text, header), original)

plugin/gateway-core/test/agent-context-shaper-hook.test.mjs

@@ -59,6 +59,7 @@ test("agent-context-shaper prepends delegated task focus reminder once", async (
 
     const text = String(output.args.prompt);
     assert.match(text, /\[agent-context-shaper\] delegated task focus/);
+    assert.match(text, /- delegated_at: \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z/);
     assert.match(text, /execute one delegated objective/i);
     assert.match(text, /prioritize: map implementation locations/);
 
@@ -70,6 +71,10 @@ test("agent-context-shaper prepends delegated task focus reminder once", async (
       (String(output.args.prompt).match(/delegated task focus/g) ?? []).length,
       1,
     );
+    assert.equal(
+      (String(output.args.prompt).match(/- delegated_at:/g) ?? []).length,
+      1,
+    );
   } finally {
     rmSync(directory, { recursive: true, force: true });
   }
@@ -100,6 +105,10 @@ test("agent-context-shaper still shapes trace-only delegations", async () => {
       String(output.args.prompt ?? ""),
       /\[agent-context-shaper\] delegated task focus/,
     );
+    assert.match(
+      String(output.args.prompt ?? ""),
+      /- delegated_at: \d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z/,
+    );
     assert.match(String(output.args.prompt ?? ""), /\[DELEGATION TRACE/);
   } finally {
     rmSync(directory, { recursive: true, force: true });

plugin/gateway-core/test/agent-model-resolver-hook.test.mjs

@@ -65,6 +65,45 @@ test("agent-model-resolver prepends timestamped headers for delegated task descr
   }
 })
 
+test("agent-model-resolver replaces WORKTREE CONTEXT when a delegation is reshaped", async () => {
+  const firstDirectory = mkdtempSync(join(tmpdir(), "gateway-agent-model-resolver-first-"))
+  const secondDirectory = mkdtempSync(join(tmpdir(), "gateway-agent-model-resolver-second-"))
+  try {
+    for (const directory of [firstDirectory, secondDirectory]) {
+      const specsDir = join(directory, "agent", "specs")
+      mkdirSync(specsDir, { recursive: true })
+      writeFileSync(
+        join(specsDir, "explore.json"),
+        JSON.stringify({ name: "explore", metadata: { default_category: "quick" } }),
+        "utf-8",
+      )
+    }
+
+    const initialPlugin = createPlugin(firstDirectory)
+    const reroutedPlugin = createPlugin(secondDirectory)
+    const output = {
+      args: {
+        subagent_type: "explore",
+        description: "Scout repository patterns",
+        prompt: "Inspect code paths",
+      },
+    }
+
+    await initialPlugin["tool.execute.before"]({ tool: "task", sessionID: "session-worktree-reroute" }, output)
+    await reroutedPlugin["tool.execute.before"]({ tool: "task", sessionID: "session-worktree-reroute" }, output)
+
+    const prompt = String(output.args.prompt ?? "")
+    const description = String(output.args.description ?? "")
+    assert.equal((prompt.match(/^\[WORKTREE CONTEXT(?:\s+|\])/gm) ?? []).length, 1)
+    assert.equal((description.match(/^\[WORKTREE CONTEXT(?:\s+|\])/gm) ?? []).length, 1)
+    assert.match(prompt, new RegExp(`cwd=${secondDirectory.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`))
+    assert.doesNotMatch(prompt, new RegExp(`cwd=${firstDirectory.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}`))
+  } finally {
+    rmSync(firstDirectory, { recursive: true, force: true })
+    rmSync(secondDirectory, { recursive: true, force: true })
+  }
+})
+
 test("agent-model-resolver infers explore delegation and category", async () => {
   const plugin = createPlugin(REPO_DIRECTORY)
   const output = {