@stigmer/runner 3.11.1-dev.20260812192248 → 3.12.1

package/src/activities/execute-cursor/index.ts

@@ -72,7 +72,6 @@ import { StreamingUpdateScheduler, loadStreamingConfig } from "../../shared/stre
 import { createCursorEventRecorder } from "./cursor-event-recorder.js";
 import { resolveMcpServers, toCursorMcpConfig, validateMcpServerEnv } from "./mcp-resolver.js";
 import { resolveMcpTransportPosture } from "../../shared/mcp-transport-guard.js";
-import { synthesizeDatastoreAttachment } from "../../shared/datastore-attachment.js";
 import {
   discoverChannelMessaging,
   synthesizeChannelAttachment,
@@ -665,35 +664,16 @@ async function executeCursorInner(
       ?? config.stigmerTokenRef?.current
       ?? config.stigmerToken;
 
-    // Phase 4a2: Synthesize the datastore records attachment (T05).
-    // Deliberately AFTER resolve + backfill: the attachment has no
-    // McpServerUsage and reports discovered capabilities, so the
-    // backfill's destructiveHint tightener can never force-gate
-    // delete_record (which on channels would be silently skipped).
-    // Empty approval maps keep it approval-free by construction.
-    if (blueprint.datastoreUsages.length > 0) {
-      const attachment = synthesizeDatastoreAttachment(blueprint.datastoreUsages, {
-        bridgeEndpoint: config.mcpBridgeEndpoint,
-        credential: attachmentCredential,
-        backendEndpoint: config.stigmerBackendEndpoint,
-      });
-      if (attachment) {
-        const resolvedServers = injectSynthesizedAttachment(
-          mcpResolution.resolvedServers, attachment, "datastore records",
-        );
-        mcpResolution = {
-          resolvedServers,
-          cursorConfig: toCursorMcpConfig(resolvedServers),
-        };
-      }
-    }
-
-    // Phase 4a3: Synthesize the channel messaging attachment (DD-006
-    // D7/D8), the records attachment's twin. The discovery read is the
-    // attachment decision — the control plane runs the SAME candidate
-    // computation the send authorization uses — and every failure mode
-    // (no channel, OSS, registry down, pre-3a control plane) degrades
-    // to honest absence: no tool, no section, execution unharmed.
+    // Phase 4a2: Synthesize the channel messaging attachment (DD-006
+    // D7/D8). Deliberately AFTER resolve + backfill: the attachment has
+    // no McpServerUsage and reports discovered capabilities, so the
+    // backfill's destructiveHint tightener can never force-gate its
+    // tools; empty approval maps keep it approval-free by construction.
+    // The discovery read is the attachment decision — the control plane
+    // runs the SAME candidate computation the send authorization uses —
+    // and every failure mode (no channel, OSS, registry down, pre-3a
+    // control plane) degrades to honest absence: no tool, no section,
+    // execution unharmed.
     const channelMessaging = await discoverChannelMessaging(client, exchangedRunnerToken);
     if (channelMessaging.length > 0) {
       const attachment = synthesizeChannelAttachment(channelMessaging, {
@@ -802,6 +782,7 @@ async function executeCursorInner(
     const attachmentEntries = attachmentResults.map((a) => ({
       path: a.relativePath,
       ...(a.renamedFrom !== undefined ? { renamedFrom: a.renamedFrom } : {}),
+      ...(a.downloadUrl !== undefined ? { downloadUrl: a.downloadUrl } : {}),
     }));
     // Vision facts, derived once from the single resolution result: the
     // images the model will see inline (in attachment order) and the ones
@@ -1147,13 +1128,13 @@ async function executeCursorInner(
       instructions: blueprint.instructions,
       userMessage: spec.message,
       skills: skillMetadata,
-      datastoreUsages: blueprint.datastoreUsages,
       channelMessaging,
       subAgents: blueprint.subAgents,
       workspaceDirs: blueprint.workspaceDirs,
       workspaceFileRefs: spec.workspaceFileRefs ?? [],
       attachments: attachmentEntries,
       vision: visionPromptInfo,
+      downloadUrlKind: artifactStorage?.downloadUrlKind,
       pendingApprovals: adjudicatedApprovals,
       appliedToolCallIds,
       interactionMode,
@@ -1821,13 +1802,13 @@ async function executeCursorInner(
             instructions: blueprint.instructions,
             userMessage: spec.message,
             skills: skillMetadata,
-            datastoreUsages: blueprint.datastoreUsages,
             channelMessaging,
             subAgents: blueprint.subAgents,
             workspaceDirs: blueprint.workspaceDirs,
             workspaceFileRefs: spec.workspaceFileRefs ?? [],
             attachments: attachmentEntries,
             vision: visionPromptInfo,
+            downloadUrlKind: artifactStorage?.downloadUrlKind,
             pendingApprovals: adjudicatedApprovals,
             // Without the applied set, the HITL-recovery prompt would tell
             // the fresh agent to carry out writes the runner already
@@ -2367,8 +2348,6 @@ export interface BuildPromptInput {
   instructions: string;
   userMessage: string;
   skills: import("./prompt-builder.js").SkillMetadata[];
-  /** Datastores attached via `datastore_usages` — the `<available_datastores>` section. */
-  datastoreUsages?: import("@stigmer/protos/ai/stigmer/agentic/agent/v1/spec_pb").DatastoreUsage[];
   /**
    * Serving proactive channels + their templates (the DD-006 D2
    * discovery read) — the `<available_channel_templates>` section.
@@ -2388,6 +2367,12 @@ export interface BuildPromptInput {
    * catchup — it rides both the enhanced prompt and a resumed turn's prefix.
    */
   vision?: import("./prompt-builder.js").VisionPromptInfo;
+  /**
+   * What kind of URL the turn's storage backend mints (issue #532) — keys
+   * the input-files hand-off wording. Sourced from the resolved
+   * artifactStorage's self-description; absent when no storage resolved.
+   */
+  downloadUrlKind?: import("../../shared/attachment-download-urls.js").DownloadUrlKind;
   pendingApprovals: import("@stigmer/protos/ai/stigmer/agentic/agentexecution/v1/approval_pb").PendingApproval[];
   /**
    * Approved whole-file writes the runner already applied itself (exact-apply).
@@ -2546,13 +2531,13 @@ export function buildPrompt(input: BuildPromptInput): string {
           instructions,
           userMessage,
           skills,
-          datastoreUsages: input.datastoreUsages ?? [],
           channelMessaging: input.channelMessaging ?? [],
           subAgents,
           workspaceDirs,
           workspaceFileRefs,
           attachments,
           vision: input.vision,
+          downloadUrlKind: input.downloadUrlKind,
           interactionMode,
           buildFromPlan,
           contextBridge: input.contextBridge,
@@ -2594,7 +2579,7 @@ export function buildPrompt(input: BuildPromptInput): string {
       formatInteractionModePrefix(interactionMode),
       formatImplementPlanSection(buildFromPlan, attachments),
       attachments.length > 0
-        ? formatInputFiles(attachments, input.vision)
+        ? formatInputFiles(attachments, input.vision, input.downloadUrlKind)
         : undefined,
       conversationCatchup !== undefined
         ? formatConversationCatchupSection(conversationCatchup)
@@ -2612,13 +2597,13 @@ export function buildPrompt(input: BuildPromptInput): string {
     instructions,
     userMessage,
     skills,
-    datastoreUsages: input.datastoreUsages ?? [],
     channelMessaging: input.channelMessaging ?? [],
     subAgents,
     workspaceDirs,
     workspaceFileRefs,
     attachments,
     vision: input.vision,
+    downloadUrlKind: input.downloadUrlKind,
     interactionMode,
     buildFromPlan,
     contextBridge: input.contextBridge,

package/src/activities/execute-cursor/prompt-builder.ts

@@ -17,12 +17,11 @@
  */
 
 import { resolve } from "node:path";
-import type { DatastoreUsage, SubAgent } from "@stigmer/protos/ai/stigmer/agentic/agent/v1/spec_pb";
+import type { SubAgent } from "@stigmer/protos/ai/stigmer/agentic/agent/v1/spec_pb";
 import type { PendingApproval } from "@stigmer/protos/ai/stigmer/agentic/agentexecution/v1/approval_pb";
 import { ApprovalAction, InteractionMode } from "@stigmer/protos/ai/stigmer/agentic/agentexecution/v1/enum_pb";
 import { formatContextBridgeText } from "../../shared/context-bridge.js";
 import { formatConversationCatchupText } from "../../shared/conversation-catchup.js";
-import { formatDatastoresSection } from "../../shared/datastore-attachment.js";
 import {
   formatChannelTemplatesSection,
   type ChannelMessagingInfo,
@@ -36,6 +35,10 @@ import {
   visionDisclosureLines,
   type NotViewableEntry,
 } from "../../shared/attachment-vision.js";
+import {
+  downloadUrlDisclosureLine,
+  type DownloadUrlKind,
+} from "../../shared/attachment-download-urls.js";
 import { formatTurnRecoveryText } from "./turn-recovery.js";
 import { PLAN_MODE_DIRECTIVE } from "../../shared/plan-mode-prompt.js";
 import {
@@ -82,21 +85,18 @@ export interface AttachmentPromptEntry {
   path: string;
   /** Original filename, present only when a duplicate name was renamed. */
   renamedFrom?: string;
+  /**
+   * Download URL for the attachment's stored object, when one was minted
+   * (shared/attachment-download-urls.ts) — rendered beside the path so the
+   * agent can hand the file to tools that cannot read this filesystem.
+   */
+  downloadUrl?: string;
 }
 
 export interface EnhancedPromptOptions {
   instructions: string;
   userMessage: string;
   skills: SkillMetadata[];
-  /**
-   * Datastores attached via `datastore_usages` — rendered as the
-   * `<available_datastores>` section (DD-005 SD-5, skills precedent)
-   * pointing the model at the synthesized record tools. Always the healthy
-   * rendering here: the Cursor SDK connects MCP itself, so this harness can
-   * never observe the live roster — the section's standing
-   * failure-disclosure instruction is its whole coverage (issue #325).
-   */
-  datastoreUsages?: DatastoreUsage[];
   /**
    * Serving proactive channels + their approved templates — rendered as
    * the `<available_channel_templates>` section (proactive-messaging
@@ -109,6 +109,12 @@ export interface EnhancedPromptOptions {
   attachments: AttachmentPromptEntry[];
   /** Inline/degraded image facts for the input-files section (T04 vision). */
   vision?: VisionPromptInfo;
+  /**
+   * What kind of URL the turn's storage backend mints — 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;
   interactionMode?: InteractionMode;
   /**
    * The execution is a Build-from-plan turn (spec.execution_config
@@ -183,10 +189,6 @@ export function buildEnhancedPrompt(options: EnhancedPromptOptions): string {
     sections.push(formatSkillsSection(options.skills));
   }
 
-  if (options.datastoreUsages !== undefined && options.datastoreUsages.length > 0) {
-    sections.push(formatDatastoresSection(options.datastoreUsages));
-  }
-
   if (options.channelMessaging !== undefined && options.channelMessaging.length > 0) {
     // "" when nothing is sendable — the tool alone still serves text
     // sends inside a 24-hour window (DD-006 D6).
@@ -212,7 +214,7 @@ export function buildEnhancedPrompt(options: EnhancedPromptOptions): string {
   }
 
   if (options.attachments.length > 0) {
-    sections.push(formatInputFiles(options.attachments, options.vision));
+    sections.push(formatInputFiles(options.attachments, options.vision, options.downloadUrlKind));
   }
 
   if (options.workspaceFileRefs.length > 0) {
@@ -548,15 +550,28 @@ export function formatWorkspaceContext(dirs: string[]): string {
 export function formatInputFiles(
   attachments: readonly AttachmentPromptEntry[],
   vision?: VisionPromptInfo,
+  downloadUrlKind?: DownloadUrlKind,
 ): string {
   // A duplicate-renamed file (attachment-naming.ts) discloses its original
   // name so the agent can connect "the two report.pdfs" in the user's
-  // message to distinct files on disk.
-  const entries = attachments.map((a) =>
-    a.renamedFrom !== undefined
-      ? `- \`${a.path}\` (renamed from duplicate '${a.renamedFrom}')`
-      : `- \`${a.path}\``,
-  );
+  // message to distinct files on disk. A file with a minted download URL
+  // (attachment-download-urls.ts) lists it beside the path for the remote
+  // hand-off story.
+  const entries = attachments.map((a) => {
+    const rename =
+      a.renamedFrom !== undefined
+        ? ` (renamed from duplicate '${a.renamedFrom}')`
+        : "";
+    const url = a.downloadUrl !== undefined ? ` — download URL: ${a.downloadUrl}` : "";
+    return `- \`${a.path}\`${rename}${url}`;
+  });
+  // The URL hand-off line (shared wording, attachment-download-urls.ts)
+  // renders only when some listed file actually carries a URL — its wording
+  // keys on what kind of URL the storage backend mints.
+  const urlDisclosure =
+    downloadUrlKind !== undefined && attachments.some((a) => a.downloadUrl !== undefined)
+      ? [downloadUrlDisclosureLine(downloadUrlKind)]
+      : [];
   // The vision lines (shared wording, attachment-vision.ts) tell the model
   // which of these files it can already SEE inline versus which degraded to
   // path-only — without them an agent silently ignores a photo the user
@@ -568,6 +583,7 @@ export function formatInputFiles(
     "<input_files>",
     "The following files have been provided as inputs. Read them when relevant to the task:",
     ...entries,
+    ...urlDisclosure,
     ...disclosure,
     "</input_files>",
   ].join("\n");