@stigmer/runner 3.39.1-dev.20260928194002 → 3.40.1

package/src/activities/execute-deep-agent/prompt-builder.ts

@@ -1,19 +1,32 @@
 /**
- * The native harness's system prompt: what `createDeepAgent` receives as
- * `systemPrompt`, rebuilt on EVERY invocation (never checkpointed with the
- * message history), so every standing fact is injected on every turn by
- * design — a first-turn-only injection would vanish from turn 2 onward.
+ * The native harness's prompt: the system prompt `createDeepAgent` receives
+ * as `systemPrompt`, and the turn's user message.
+ *
+ * The system prompt is rebuilt on EVERY invocation (never checkpointed with
+ * the message history), so every standing fact is injected on every turn by
+ * design — a first-turn-only injection would vanish from turn 2 onward. It is
+ * a function of the session and of the execution's settings (its mode), never
+ * of the turn. The provider caches tools, system and messages as one prefix,
+ * so a system byte that follows the message re-writes the cached prompt and
+ * the whole conversation after it, on every turn, at the cache-write price.
+ * What belongs to one turn — its input files, the workspace paths it
+ * references, the conversation catchup — rides that turn's user message
+ * (`composeUserMessage`), which enters the checkpointer with the turn and
+ * stays in history. That is the Cursor harness's resumed-turn placement
+ * (`execute-cursor/prompt-builder.ts` `buildPrompt`) and the runner's rule
+ * that user content goes in user messages, never the system prompt.
  *
  * Pure functions: no side effects, no I/O. `turn-setup.ts` gathers the
  * inputs from the runtime's resolved record and this module renders them.
  *
  * What is this harness's and what is shared (since #1096):
  *  - Shared through `shared/prompt-sections.ts`: WHICH standing sections
- *    render and in WHAT order (`standingContextSections`), the input-files
- *    bullet and disclosure lines (`inputFileLines`), which skills a prompt
- *    highlights (`selectSkillsForPrompt`, called from `turn-setup.ts`) and
- *    the also-available sentence. Their WORDS come from each fact's own
- *    module; this builder only frames them.
+ *    render and in WHAT order (`standingContextSections`) and the
+ *    input-files bullet and disclosure lines (`inputFileLines`). Their WORDS
+ *    come from each fact's own module; this builder only frames them. Every
+ *    mounted skill is described on every turn, as the Cursor harness does:
+ *    choosing skills by the message made the system prompt follow the
+ *    message.
  *  - This harness's: the framing — `## Heading` markdown sections, the house
  *    style for a system prompt — and every text that quotes this engine's
  *    tools: the `## Skills` activation protocol, the response rules, the
@@ -24,7 +37,8 @@
  *
  * The rendered bytes are load-bearing for the hermetic tests: `ScriptedModel`
  * tells its scripted roles apart by the system prompt's text, so this
- * module's whole output is pinned by `__tests__/prompt-goldens.test.ts`.
+ * module's whole output — the system prompt and the turn's message — is
+ * pinned by `__tests__/prompt-goldens.test.ts`.
  */
 
 import { relative } from "node:path";
@@ -43,10 +57,7 @@ import {
 } from "../../shared/prompt-sections.js";
 import { effectiveInstructions } from "../../shared/builtin-assistant-prompt.js";
 import { PLAN_MODE_DIRECTIVE } from "../../shared/plan-mode-prompt.js";
-import {
-  buildImplementPlanDirective,
-  findApprovedPlanPath,
-} from "../../shared/implement-plan-prompt.js";
+import { buildImplementPlanDirective } from "../../shared/implement-plan-prompt.js";
 import type { ResolvedAttachment } from "../../shared/attachment-resolver.js";
 import type { SkillMetadata } from "../../shared/skill-resolver.js";
 import { STIGMER_LOCAL_STATE_DIR } from "../../shared/workspace/stigmer-link.js";
@@ -131,22 +142,6 @@ export interface PromptBuilderInput {
    * when the agent serves no proactive channel or nothing is sendable.
    */
   channelTemplatesPromptSection?: string;
-  workspaceFileRefs: string[];
-  workspaceRoot: string;
-  /** The turn's resolved input files, as the runtime's attachment phase returns them. */
-  inputFiles: readonly ResolvedAttachment[];
-  /**
-   * Vision facts about this turn's attachments (T04): which images the model
-   * sees inline in the user message and which degraded to path-only.
-   * Rendered inside the Input Files section.
-   */
-  vision?: VisionPromptInfo;
-  /**
-   * What kind of URL the turn's storage backend mints (issue #532) — keys
-   * the Input Files section's hand-off wording (attachment-download-urls.ts).
-   * One turn-level fact: all attachments ride the one configured storage.
-   */
-  downloadUrlKind?: DownloadUrlKind;
   /**
    * The execution's interaction mode. PLAN appends the shared plan-mode
    * directive so the model knows the turn's deliverable is a plan document.
@@ -163,6 +158,14 @@ export interface PromptBuilderInput {
    * message itself is just a short label ("Build from plan").
    */
   buildFromPlan?: boolean;
+  /**
+   * The approved plan's path among the turn's input files
+   * (`implement-plan-prompt.ts` `findApprovedPlanPath`), read only under
+   * `buildFromPlan`. Absent when the plan did not materialize, which selects
+   * the directive's conversation-plan variant. The Input Files section
+   * itself rides the turn's message (`composeUserMessage`).
+   */
+  approvedPlanPath?: string;
   /**
    * Rollover context bridge (cloud DD-013): a digest of the previous
    * session's conversation, read from `SessionSpec.metadata`. Injected on
@@ -252,22 +255,6 @@ export function buildEnhancedSystemPrompt(input: PromptBuilderInput): string {
     prompt += "\n\n" + input.channelTemplatesPromptSection;
   }
 
-  if (input.workspaceFileRefs.length > 0) {
-    const refSection = buildReferencedFilesSection(
-      input.workspaceFileRefs,
-      input.workspaceRoot,
-    );
-    if (refSection) {
-      prompt += refSection;
-    }
-  }
-
-  if (input.inputFiles.length > 0) {
-    prompt += buildInputFilesSection(
-      input.inputFiles, input.vision, input.downloadUrlKind,
-    );
-  }
-
   // The standing context, in the shared order (the doctrine is stated once,
   // on `standingContextSections`); this harness only frames each section.
   for (const section of standingContextSections(input)) {
@@ -296,34 +283,67 @@ export function buildEnhancedSystemPrompt(input: PromptBuilderInput): string {
   }
 
   if (input.buildFromPlan) {
-    const planPath = findApprovedPlanPath(
-      input.inputFiles.map((f) => f.relativePath),
-    );
     prompt +=
       "\n\n## Implement the approved plan\n\n" +
-      buildImplementPlanDirective(planPath);
+      buildImplementPlanDirective(input.approvedPlanPath);
   }
 
   return prompt;
 }
 
+/** The turn's own content, composed around what the user typed. */
+export interface TurnMessageInput {
+  /** What the user typed (`spec.message`); never mutated. */
+  readonly message: string;
+  /** The conversation catchup digest (cloud DD-006), when the turn carries one. */
+  readonly conversationCatchup?: string;
+  /** This turn's resolved input files, as the runtime's attachment phase returns them. */
+  readonly inputFiles: readonly ResolvedAttachment[];
+  /**
+   * Vision facts about this turn's attachments (T04): which images the model
+   * sees inline in this same message and which degraded to path-only.
+   * Rendered inside the Input Files section.
+   */
+  readonly vision?: VisionPromptInfo;
+  /**
+   * What kind of URL the turn's storage backend mints (issue #532) — keys
+   * the Input Files section's hand-off wording (attachment-download-urls.ts).
+   * One turn-level fact: all attachments ride the one configured storage.
+   */
+  readonly downloadUrlKind?: DownloadUrlKind;
+  /** The workspace paths the user highlighted for this message (`spec.workspace_file_refs`). */
+  readonly workspaceFileRefs: readonly string[];
+}
+
 /**
- * Compose the turn's USER MESSAGE for the graph invocation: the framed
- * conversation catchup (cloud DD-006), when present, prepended to the
- * customer's message. In the user message and never the system prompt (A27):
- * the system prompt is rebuilt per invocation and would forget the digest one
- * turn later, while a message enters the checkpointer with the turn and
- * persists in history — the same durability the cursor harness gets from its
- * prompt prefix. The caller's `spec.message` is never mutated; the prepend
- * exists only in the graph input.
+ * Compose the turn's USER MESSAGE for the graph invocation: this turn's
+ * payload (its input files, then the workspace paths it references), then the
+ * framed conversation catchup (cloud DD-006), then what the user typed, each
+ * set off by a horizontal rule. Payload first and context closest to the task
+ * is the Cursor harness's resumed-turn order.
+ *
+ * In the user message and never the system prompt (A27, and the module
+ * header): the system prompt is rebuilt per invocation, so a turn's content
+ * there would vanish one turn later and, while it lasted, change the cached
+ * prefix; a message enters the checkpointer with the turn and persists in
+ * history, so a later turn still knows which files an earlier one carried.
+ * An approval resume sends no new message and needs none: the payload is
+ * already in the checkpointed one. The caller's `spec.message` is never
+ * mutated; the composition exists only in the graph input.
  */
-export function composeUserMessage(
-  message: string,
-  conversationCatchup: string | undefined,
-): string {
-  return conversationCatchup
-    ? `${formatConversationCatchupText(conversationCatchup)}\n\n---\n\n${message}`
-    : message;
+export function composeUserMessage(input: TurnMessageInput): string {
+  const parts: string[] = [];
+  if (input.inputFiles.length > 0) {
+    parts.push(buildInputFilesSection(input.inputFiles, input.vision, input.downloadUrlKind));
+  }
+  if (input.workspaceFileRefs.length > 0) {
+    parts.push(buildReferencedFilesSection(input.workspaceFileRefs));
+  }
+  if (input.conversationCatchup) {
+    parts.push(formatConversationCatchupText(input.conversationCatchup));
+  }
+  parts.push(input.message);
+  return parts.join("\n\n---\n\n");
 }
 
 /**
@@ -454,14 +474,14 @@ function formatEntryDescription(result: ProvisionResult): string {
     );
   }
 
+  // No commit: the clone's HEAD moves with every write-back commit, and a
+  // system prompt that names it would change on every such turn
+  // (`shared/workspace/sources/git.ts` says the same for one entry).
   if (result.sourceType === "git_repo" && result.gitMetadata) {
     const meta: GitMetadata = result.gitMetadata;
-    const shortSha = meta.baseCommit.length >= 7
-      ? meta.baseCommit.slice(0, 7)
-      : meta.baseCommit;
+    const branch = meta.branch ? ` (branch: ${meta.branch})` : "";
     return (
-      `Workspace entry **${name}** was initialized from ` +
-      `${meta.repoUrl} (branch: ${meta.branch}, commit: ${shortSha}).\n` +
+      `Workspace entry **${name}** was initialized from ${meta.repoUrl}${branch}.\n` +
       "Changes you make will be captured as artifacts when execution completes."
     );
   }
@@ -476,36 +496,29 @@ function formatEntryDescription(result: ProvisionResult): string {
   return result.workspaceDescription;
 }
 
-function buildReferencedFilesSection(
-  workspaceFileRefs: string[],
-  _workspaceRoot: string,
-): string {
-  if (workspaceFileRefs.length === 0) return "";
-
-  let section =
-    "\n\n## Referenced Files\n\n" +
+/** The `## Referenced Files` part of the turn's message: the paths the user highlighted, one bullet each. */
+function buildReferencedFilesSection(workspaceFileRefs: readonly string[]): string {
+  return (
+    "## Referenced Files\n\n" +
     "The user has highlighted the following workspace paths for your " +
-    `attention. Use \`${ENGINE_TOOL.readFile}\` to access file contents.\n\n`;
-
-  for (const refPath of workspaceFileRefs) {
-    section += `- \`${refPath}\`\n`;
-  }
-
-  return section;
+    `attention. Use \`${ENGINE_TOOL.readFile}\` to access file contents.\n\n` +
+    workspaceFileRefs.map((refPath) => `- \`${refPath}\``).join("\n")
+  );
 }
 
 /**
- * The `## Input Files` section: this harness's intro (it names this engine's
- * file-reading tool) around the shared lines (`prompt-sections.ts` `inputFileLines`
- * says what each bullet and disclosure carries and why). Each disclosure
- * group is set off by a blank line, the markdown idiom.
+ * The `## Input Files` part of the turn's message: this harness's intro (it
+ * names this engine's file-reading tool) around the shared lines
+ * (`prompt-sections.ts` `inputFileLines` says what each bullet and disclosure
+ * carries and why). Each disclosure group is set off by a blank line, the
+ * markdown idiom.
  */
 function buildInputFilesSection(
   files: readonly ResolvedAttachment[],
   vision?: VisionPromptInfo,
   downloadUrlKind?: DownloadUrlKind,
 ): string {
-  let section = "\n\n## Input Files\n\n";
+  let section = "## Input Files\n\n";
   section +=
     "The following files have been provided as read-only reference " +
     "material for your task. They live under `.stigmer/inputs/` and " +
@@ -526,7 +539,6 @@ function buildInputFilesSection(
     section += "\n" + lines.vision.join("\n") + "\n";
   }
 
-  // Every section opens with its own blank line ("\n\n## ..."), so this one
-  // ends on its last line rather than adding a second blank (#1127).
+  // The part ends on its last line; the message's rule sets it off (#1127).
   return section.replace(/\n+$/, "");
 }

package/src/activities/execute-deep-agent/turn-setup.ts

@@ -67,7 +67,8 @@ import { buildChatModel } from "../../shared/model-client.js";
 import { graphThinks, toAnthropicThinking } from "../../shared/thinking-mode.js";
 import { isUnattendedApprovalMode, type MergedToolPolicy } from "../../shared/approval-policy.js";
 import type { ToolApprovalCategory } from "../../shared/tool-kind.js";
-import { alsoAvailableSkillsNote, selectSkillsForPrompt, visionPromptInfoOf } from "../../shared/prompt-sections.js";
+import { visionPromptInfoOf } from "../../shared/prompt-sections.js";
+import { findApprovedPlanPath } from "../../shared/implement-plan-prompt.js";
 import type { RecalledMemoriesContent } from "../../shared/recalled-memories.js";
 import { toLangChainImageBlocks } from "../../shared/attachment-vision.js";
 import { resolveRecursionLimit, UNBOUNDED_ADVISORY_RECURSION_LIMIT } from "../../shared/tool-rounds.js";
@@ -260,25 +261,6 @@ export function readGateState(input: TurnInput, tools: DeepAgentTools): DeepAgen
   };
 }
 
-/**
- * The `## Skills` section of the root prompt: the skills the shared selection
- * highlights for this turn's message (`shared/prompt-sections.ts`
- * `selectSkillsForPrompt`: every skill below the threshold, the relevant ones
- * at and above it), rendered with this engine's activation protocol, plus —
- * when the selection left any out — an `### Also Available` note naming them
- * (the sentence is the shared, tool-neutral one; the heading is this
- * harness's markdown framing).
- */
-export function renderRootSkillsSection(input: TurnInput): string {
-  const { highlighted, alsoAvailable } = selectSkillsForPrompt(input.execution.spec?.message ?? "", input.skills.root);
-  if (alsoAvailable.length === 0) return renderSkillsSection(highlighted);
-  console.log(
-    `[turn-setup] Skill relevance filter: ${highlighted.length} included, ` +
-    `${alsoAvailable.length} excluded: ${alsoAvailable.join(", ")}`,
-  );
-  return renderSkillsSection(highlighted) + "\n### Also Available\n\n" + alsoAvailableSkillsNote(alsoAvailable) + "\n";
-}
-
 /**
  * The system prompt over the runtime's resolved record: every input the
  * builder renders is read from `TurnInput` here, in one place, so the mapping
@@ -287,6 +269,12 @@ export function renderRootSkillsSection(input: TurnInput): string {
  * that is not on the record is the memoized memory selection, which the
  * caller awaits (the runtime stamps the report on the status the first time
  * it is pulled, before this turn's first persist).
+ *
+ * Nothing here reads the turn's message or payload: the system prompt is the
+ * session's (`prompt-builder.ts` says why), so every mounted skill is
+ * described and the turn's files ride its message (`composeTurnMessage`).
+ * The approved plan's path is the one fact taken from the attachments, and
+ * only on a build-from-plan turn, where the mode already changes the prompt.
  */
 export function composeSystemPrompt(input: TurnInput, recalledMemories: RecalledMemoriesContent | undefined): string {
   const spec = input.execution.spec!;
@@ -296,19 +284,17 @@ export function composeSystemPrompt(input: TurnInput, recalledMemories: Recalled
     instructions: input.blueprint.instructions,
     provisionResults: input.workspace.provision.provisionResults,
     containerRoot: primaryDir,
-    skillsPromptSection: renderRootSkillsSection(input),
+    skillsPromptSection: renderSkillsSection(input.skills.root),
     // "" (nothing sendable) threads as undefined: the tool alone still serves
     // text sends inside a 24-hour window (DD-006 D6).
     channelTemplatesPromptSection: input.mcp.channelMessaging.length > 0
       ? formatChannelTemplatesSection(input.mcp.channelMessaging) || undefined
       : undefined,
-    workspaceFileRefs: spec.workspaceFileRefs ?? [],
-    workspaceRoot: primaryDir,
-    inputFiles: input.attachments.results,
-    vision: visionPromptInfoOf(input.attachments),
-    downloadUrlKind: input.artifactStorage?.downloadUrlKind,
     interactionMode: execConfig?.interactionMode,
     buildFromPlan: execConfig?.buildFromPlan,
+    ...(execConfig?.buildFromPlan
+      ? { approvedPlanPath: findApprovedPlanPath(input.attachments.results.map((f) => f.relativePath)) }
+      : {}),
     contextBridge: input.standing.contextBridge,
     senderIdentity: input.standing.senderIdentity,
     sessionContext: input.standing.sessionContext,
@@ -317,6 +303,25 @@ export function composeSystemPrompt(input: TurnInput, recalledMemories: Recalled
   });
 }
 
+/**
+ * The turn's user message over the runtime's resolved record: what the user
+ * typed, with this turn's payload (its input files and referenced paths) and
+ * the conversation catchup composed around it (`prompt-builder.ts`
+ * `composeUserMessage`). The twin of `composeSystemPrompt` for the turn's
+ * half, so the goldens pin this mapping and not a copy of it.
+ */
+export function composeTurnMessage(input: TurnInput): string {
+  const spec = input.execution.spec!;
+  return composeUserMessage({
+    message: spec.message,
+    conversationCatchup: input.standing.conversationCatchup,
+    inputFiles: input.attachments.results,
+    vision: visionPromptInfoOf(input.attachments),
+    downloadUrlKind: input.artifactStorage?.downloadUrlKind,
+    workspaceFileRefs: spec.workspaceFileRefs ?? [],
+  });
+}
+
 /**
  * Build the engine: the model, the middleware stack with the gate, the
  * tools, the compiled sub-agents, the system prompt and `createDeepAgent`.
@@ -577,9 +582,10 @@ export async function buildEngine(
  * What the graph is invoked with. The checkpoint is read once (on the
  * durable http saver an extra `getState` is a network round-trip): pending
  * interrupts that the runtime's decisions answer make a `Command(resume)`;
- * anything else is the turn's user message — the conversation catchup
- * framed before it (cloud DD-006; in the USER MESSAGE so it enters the
- * checkpointer with the turn), the structured-output contract appended, and
+ * anything else is the turn's user message — this turn's payload and the
+ * conversation catchup framed before it (`composeTurnMessage`; in the USER
+ * MESSAGE so it enters the checkpointer with the turn and the system prompt
+ * stays the session's), the structured-output contract appended, and
  * the inline images FIRST as content blocks when the turn carries any (per
  * Anthropic's images-before-text guidance; a plain string otherwise).
  */
@@ -590,8 +596,7 @@ export async function composeGraphInput(input: TurnInput, engine: DeepAgentEngin
     return { kind: "resume", command: resume.graphInput };
   }
 
-  const spec = input.execution.spec!;
-  let userMessage = composeUserMessage(spec.message, input.standing.conversationCatchup);
+  let userMessage = composeTurnMessage(input);
   if (engine.hasStructuredOutput) {
     userMessage += `\n\n---\nIMPORTANT: When your analysis is complete, provide your findings as structured output matching the required schema. The system will capture your structured response automatically.`;
   }

package/src/shared/__tests__/prompt-sections.test.ts

@@ -1,8 +1,6 @@
 /**
- * The shared prompt glue (`shared/prompt-sections.ts`): the standing order,
- * the input-files lines, the skill selection and the also-available sentence
- * (the sentence's arms came from `skill-writer.test.ts`, retired with its
- * module in #1096). What each harness renders AROUND these is pinned whole by
+ * The shared prompt glue (`shared/prompt-sections.ts`): the standing order
+ * and the input-files lines. What each harness renders AROUND these is pinned whole by
  * the two builders' prompt goldens (`execute-deep-agent/__tests__/
  * prompt-goldens.test.ts`, `execute-cursor/__tests__/prompt-goldens.test.ts`);
  * this file pins the glue's own contract, harness-free.
@@ -10,16 +8,12 @@
 
 import { describe, it, expect } from "vitest";
 import {
-  alsoAvailableSkillsNote,
   inputFileLines,
-  selectSkillsForPrompt,
   standingContextSections,
   visionPromptInfoOf,
   type StandingSectionKind,
 } from "../prompt-sections.js";
 import type { ResolvedAttachment } from "../attachment-resolver.js";
-import type { SkillMetadata } from "../skill-resolver.js";
-import { SKILL_COUNT_THRESHOLD } from "../skill-relevance.js";
 import { formatDeclaredPreferencesText } from "../declared-preferences.js";
 
 describe("standingContextSections", () => {
@@ -119,49 +113,3 @@ describe("visionPromptInfoOf", () => {
     });
   });
 });
-
-describe("selectSkillsForPrompt", () => {
-  const skill = (name: string, description: string): SkillMetadata => ({ name, description, path: `.stigmer/skills/${name}/SKILL.md` });
-
-  it("highlights every skill below the threshold, in mount order, and names none as also-available", () => {
-    const skills = [skill("alpha", "Deploy to kubernetes"), skill("beta", "Reshape CSV exports")];
-    const selection = selectSkillsForPrompt("deploy the service", skills);
-    expect(selection.highlighted).toEqual(skills);
-    expect(selection.alsoAvailable).toEqual([]);
-  });
-
-  it("at the threshold, highlights the skills the message reaches and names the rest", () => {
-    const skills = Array.from({ length: SKILL_COUNT_THRESHOLD }, (_, i) =>
-      i === 0 ? skill("k8s-deploy", "Deploy services to kubernetes clusters") : skill(`other-${i}`, `Unrelated thing number ${i}`),
-    );
-    const selection = selectSkillsForPrompt("Deploy the payments service to kubernetes", skills);
-    expect(selection.highlighted.map((s) => s.name)).toContain("k8s-deploy");
-    expect(selection.alsoAvailable.length).toBeGreaterThan(0);
-    expect(selection.highlighted.length + selection.alsoAvailable.length).toBe(SKILL_COUNT_THRESHOLD);
-  });
-
-  it("selects nothing from nothing", () => {
-    expect(selectSkillsForPrompt("anything", [])).toEqual({ highlighted: [], alsoAvailable: [] });
-  });
-});
-
-describe("alsoAvailableSkillsNote", () => {
-  it("returns empty for no excluded names", () => {
-    expect(alsoAvailableSkillsNote([])).toBe("");
-  });
-
-  it("lists excluded skills with backtick formatting", () => {
-    const note = alsoAvailableSkillsNote(["alpha", "beta", "gamma"]);
-    expect(note).toContain("`alpha`");
-    expect(note).toContain("`beta`");
-    expect(note).toContain("`gamma`");
-  });
-
-  it("includes activation instructions that name no tool, so any harness can carry it", () => {
-    const note = alsoAvailableSkillsNote(["some-skill"]);
-    expect(note).toContain(".stigmer/skills/<name>/SKILL.md");
-    expect(note).toContain("relevant to your task");
-    expect(note).not.toMatch(/\b(read|Read) tool\b/);
-    expect(note.startsWith("#")).toBe(false);
-  });
-});

package/src/shared/prompt-sections.ts

@@ -9,8 +9,12 @@
  * `attachment-download-urls.ts`). What the two prompt builders duplicated
  * until #1096 was the glue around those bodies: the order
  * the five standing sections read in, with the same doctrine comments written
- * twice; the input-files bullet and disclosure lines; which skills a prompt
- * highlights when there are many. This module is that glue, written once.
+ * twice; the input-files bullet and disclosure lines. This module is that
+ * glue, written once. It also chose which skills a prompt highlighted when
+ * there were many, until the native harness stopped choosing skills by the
+ * turn's message: a system prompt that follows the message misses the
+ * provider's prompt cache on every turn, so every harness now describes every
+ * mounted skill.
  *
  * What stays with each harness, on purpose:
  *  - Framing and placement. The native harness renders `## Heading` sections
@@ -43,9 +47,6 @@ import { formatDeclaredPreferencesText, type DeclaredPreferencesContent } from "
 import { formatRecalledMemoriesText, type RecalledMemoriesContent } from "./recalled-memories.js";
 import { formatSenderIdentityText, type SenderIdentity } from "./sender-identity.js";
 import { formatSessionContextText } from "./session-context.js";
-import { filterSkills } from "./skill-relevance.js";
-import type { SkillMetadata } from "./skill-resolver.js";
-import { STIGMER_LOCAL_STATE_DIR } from "./workspace/stigmer-link.js";
 
 // ---------------------------------------------------------------------------
 // The standing context: five sections, one order
@@ -204,53 +205,3 @@ export function inputFileLines(
     vision: vision ? visionDisclosureLines(vision.inlineFilenames, vision.notViewable) : [],
   };
 }
-
-// ---------------------------------------------------------------------------
-// The skills: which to highlight
-// ---------------------------------------------------------------------------
-
-/** Which mounted skills a prompt highlights, and which it only names. */
-export interface SkillSelection {
-  /** The skills the prompt describes in full, in the filter's order. */
-  readonly highlighted: readonly SkillMetadata[];
-  /** The names of the skills left out of the highlighted set; empty below the threshold. */
-  readonly alsoAvailable: readonly string[];
-}
-
-/**
- * The relevance selection over the turn's message (`skill-relevance.ts`):
- * below `SKILL_COUNT_THRESHOLD` every skill is highlighted; at and above it,
- * the skills the message's terms reach are highlighted and the rest are
- * named, so the agent can still activate one on its own judgement (the Agent
- * Skills spec's progressive disclosure: metadata up front, instructions on
- * demand). The native harness calls this on every turn; the Cursor harness
- * lists every skill today; adopting the selection there is an open item.
- */
-export function selectSkillsForPrompt(userMessage: string, skills: readonly SkillMetadata[]): SkillSelection {
-  const filter = filterSkills(
-    userMessage,
-    skills.map((s) => s.name),
-    skills.map((s) => s.description),
-  );
-  return {
-    highlighted: filter.includedIndices.map((i) => skills[i]),
-    alsoAvailable: filter.excludedNames,
-  };
-}
-
-/**
- * The tool-neutral sentence that names the skills a prompt did not highlight
- * (`SkillSelection.alsoAvailable`), so the agent can activate one by reading
- * its SKILL.md at the mounted path. The sentence names no tool, so it serves
- * any harness; the heading above it is the builder's framing. Empty for no
- * names.
- */
-export function alsoAvailableSkillsNote(excludedNames: readonly string[]): string {
-  if (excludedNames.length === 0) return "";
-  const names = excludedNames.map((n) => `\`${n}\``).join(", ");
-  return (
-    `These skills are installed but were not highlighted above: ${names}. ` +
-    "If you determine one of them is relevant to your task, " +
-    `read its SKILL.md at \`${STIGMER_LOCAL_STATE_DIR}/skills/<name>/SKILL.md\` to activate it.`
-  );
-}

package/src/shared/skill-resolver.ts

@@ -14,9 +14,8 @@
  * into its prompt in its own placement. Moved from
  * `activities/execute-cursor/` in #1070; the native harness's twin
  * (`skill-writer.ts` `fetchSkillsByRefs` + `mountSkills`) retired in #1096,
- * and the module itself with it — the one renderer it kept is
- * `shared/prompt-sections.ts` `alsoAvailableSkillsNote`. This is the one
- * skills path for every harness.
+ * and the module itself with it. This is the one skills path for every
+ * harness.
  *
  * The mount is cached by the skill's content-addressed version hash
  * (stigmer/stigmer#672): metadata is fetched on every execution (that keeps

package/src/shared/workspace/__tests__/git-source.test.ts

@@ -73,14 +73,17 @@ describe("provisionGit", () => {
     expect(cmds.some((c) => c.includes("git checkout 'develop'"))).toBe(true);
   });
 
-  it("sets workspace description with repo URL and branch", async () => {
+  it("describes the clone by repo URL and branch, never by its commit", async () => {
     const backend = mockWorkspaceBackend({
       execute: routingExecute({ branch: "main\n", sha: "sha789\n" }),
     });
     const result = await provisionGit(makeOptions({ backend }));
     expect(result.workspaceDescription).toContain("github.com/org/repo.git");
-    expect(result.workspaceDescription).toContain("main");
-    expect(result.workspaceDescription).toContain("sha789");
+    expect(result.workspaceDescription).toContain("(branch: main)");
+    // The native system prompt carries this text on every turn; write-back
+    // commits move HEAD every approved turn, so a commit here would change it.
+    expect(result.workspaceDescription).not.toContain("sha789");
+    expect(result.gitMetadata?.baseCommit, "the commit stays in the metadata write-back reads").toBe("sha789");
   });
 
   // ── Default-branch resolution ─────────────────────────────────────
@@ -120,7 +123,10 @@ describe("provisionGit", () => {
 
     const result = await provisionGit(makeOptions({ backend }));
     expect(result.sourceType).toBe("git_repo");
-    expect(result.workspaceDescription).toContain("existing repo detected");
+    const fresh = await provisionGit(
+      makeOptions({ backend: mockWorkspaceBackend({ execute: routingExecute() }) }),
+    );
+    expect(result.workspaceDescription, "a reused clone is described exactly as a fresh one").toBe(fresh.workspaceDescription);
 
     expect(calls(backend).some((c) => c.includes("git init"))).toBe(false);
     expect(calls(backend).some((c) => c.includes("git fetch"))).toBe(false);
@@ -395,7 +401,7 @@ describe("provisionGit", () => {
     }));
 
     expect(result.gitMetadata!.gitCredentialsConfigured).toBe(true);
-    expect(result.workspaceDescription).toContain("existing repo detected");
+    expect(calls(backend).some((c) => c.includes("git init")), "the reuse path, not a fresh clone").toBe(false);
   });
 
   it("handles credential setup failure gracefully", async () => {