@songsid/agend 2.1.12-beta.4 → 2.1.12-beta.6

package/dist/daemon.js

@@ -16,6 +16,7 @@ import { resolveToolSet } from "./tool-permissions.js";
 import { getAgendHome } from "./paths.js";
 import { LOGIN_FLOWS } from "./login-flows.js";
 import { ProgressAccumulator, summarizeProgress } from "./tool-progress.js";
+import { assembleSystemPrompt, resolveWorkflowText } from "./prompt-file-ref.js";
 import { isCrossInstanceVisibility } from "./cross-instance-notice.js";
 import { ContextGuardian } from "./context-guardian.js";
 import { IpcServer } from "./channel/ipc-bridge.js";
@@ -1005,6 +1006,8 @@ export class Daemon extends EventEmitter {
     spawnGate;
     stormWindow;
     backendOutage;
+    /** #1314: fleet-directory fallbacks already reported to the topic (once per daemon, per field and path). */
+    promptFileFallbackNoticed = new Set();
     /** Identity of this live Daemon object; changes on object stop/restart. */
     bootId = randomUUID();
     deliveryOutbox;
@@ -8597,6 +8600,26 @@ export class Daemon extends EventEmitter {
             respond(null, `Unknown tool: ${tool}`);
         }
     }
+    /** Where this instance's `file:` refs resolve, and what a problem with one reports — never the file's contents. */
+    promptFileContext() {
+        return {
+            workingDirectory: this.config.working_directory,
+            // The only reader of the fleet's cwd: the one-release fallback to where these refs used to resolve.
+            fleetCwd: process.cwd(),
+            onWarning: (warning) => {
+                if (warning.problem === "fleet_dir_fallback") {
+                    this.logger.warn({ field: warning.field, path: warning.path, legacyPath: warning.legacyPath }, `${warning.field} file: ref is not under the instance's working directory (${warning.path}); read ${warning.legacyPath} from the fleet directory instead — make the path absolute or move the file. The fallback is removed in 2.2.`);
+                    const key = `${warning.field}:${warning.path}`;
+                    if (!this.promptFileFallbackNoticed.has(key)) {
+                        this.promptFileFallbackNoticed.add(key);
+                        this.emit("prompt_file_fallback", { name: this.name, field: warning.field, path: warning.path, legacyPath: warning.legacyPath });
+                    }
+                    return;
+                }
+                this.logger.warn({ field: warning.field, path: warning.path, problem: warning.problem, code: warning.code }, `${warning.field} file: ref gives nothing (${warning.problem}${warning.code ? ` ${warning.code}` : ""}): ${warning.path}`);
+            },
+        };
+    }
     /** Build config object for the CLI backend */
     buildBackendConfig() {
         // Antigravity 1.1.17 has no per-workspace MCP config, but its global MCP
@@ -8609,44 +8632,19 @@ export class Daemon extends EventEmitter {
             serverJs = join(__dirname, "..", "dist", "channel", "mcp-server.js");
         }
         // ── Resolve workflow and systemPrompt once, share between MCP env and instructions ──
+        // #1314: `file:` refs are relative to this instance's working directory (src/prompt-file-ref.ts).
+        const promptFiles = this.promptFileContext();
         let resolvedWorkflow;
         if (this.config.workflow === false) {
             resolvedWorkflow = false;
         }
         else {
             const wf = this.config.workflow ?? "builtin";
-            if (wf !== "builtin") {
-                let content = wf;
-                if (content.startsWith("file:")) {
-                    try {
-                        content = readFileSync(content.slice(5), "utf-8");
-                    }
-                    catch {
-                        content = "";
-                    }
-                }
-                resolvedWorkflow = content || undefined;
-            }
-        }
-        let resolvedCustomPrompt;
-        if (this.config.systemPrompt) {
-            // Support comma-separated file: paths for prompt modularization:
-            //   systemPrompt: "file:prompts/role.md, file:prompts/rules.md, file:prompts/context.md"
-            const parts = this.config.systemPrompt.split(",").map((s) => s.trim());
-            const resolved = parts.map((part) => {
-                if (part.startsWith("file:")) {
-                    try {
-                        return readFileSync(part.slice(5), "utf-8");
-                    }
-                    catch {
-                        return "";
-                    }
-                }
-                return part;
-            }).filter(Boolean);
-            if (resolved.length > 0)
-                resolvedCustomPrompt = resolved.join("\n\n");
+            if (wf !== "builtin")
+                resolvedWorkflow = resolveWorkflowText(wf, promptFiles) || undefined;
         }
+        // Comma-separated parts (`file:role.md, file:rules.md`) only when a part is a file ref; otherwise one inline prompt.
+        const resolvedCustomPrompt = this.config.systemPrompt ? assembleSystemPrompt(this.config.systemPrompt, promptFiles) : undefined;
         let decisions;
         if (process.env.AGEND_DECISIONS) {
             try {