u-foo 1.9.6 → 1.9.8

package/bin/ufoo.js

@@ -29,13 +29,15 @@ async function main() {
   }
   if (cmd === "agent-runner") {
     const agentType = argv[1] || "codex";
-    await runInternalRunner({ projectRoot: process.cwd(), agentType });
+    const extraArgs = argv.slice(2);
+    await runInternalRunner({ projectRoot: process.cwd(), agentType, extraArgs });
     return;
   }
   if (cmd === "agent-pty-runner") {
     const agentType = argv[1] || "codex";
+    const extraArgs = argv.slice(2);
     try {
-      await runPtyRunner({ projectRoot: process.cwd(), agentType });
+      await runPtyRunner({ projectRoot: process.cwd(), agentType, extraArgs });
     } catch (err) {
       const normalized = String(agentType || "").trim().toLowerCase();
       if (normalized === "ufoo" || normalized === "ucode" || normalized === "ufoo-code") {
@@ -44,7 +46,7 @@ async function main() {
       // Fallback to headless runner if PTY is unavailable
       // eslint-disable-next-line no-console
       console.error(`[pty-runner] ${err.message || err}. Falling back to headless internal runner.`);
-      await runInternalRunner({ projectRoot: process.cwd(), agentType });
+      await runInternalRunner({ projectRoot: process.cwd(), agentType, extraArgs });
     }
     return;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "u-foo",
-  "version": "1.9.6",
+  "version": "1.9.8",
   "description": "Multi-Agent Workspace Protocol. Just add u. claude → uclaude, codex → ucodex.",
   "license": "SEE LICENSE IN LICENSE",
   "homepage": "https://ufoo.dev",

package/src/agent/cliRunner.js

@@ -484,6 +484,10 @@ const DEFAULT_CODEX = {
 
 function buildArgs(backend, prompt, opts) {
   const args = [...(backend.args || [])];
+  const extraArgs = Array.isArray(opts.extraArgs) ? opts.extraArgs.filter(Boolean) : [];
+  if (extraArgs.length > 0) {
+    args.push(...extraArgs);
+  }
   if (opts.model && backend.modelArg) {
     args.push(backend.modelArg, opts.model);
   }
@@ -588,6 +592,7 @@ async function runCliAgent(params) {
     sessionId,
     systemPrompt: params.systemPrompt,
     disableSession: params.disableSession,
+    extraArgs: params.extraArgs,
   });
   if (backend === DEFAULT_CODEX && params.sandbox) {
     applySandboxOverride(args, params.sandbox);
@@ -642,6 +647,7 @@ async function runCliAgent(params) {
             sessionId,
             systemPrompt: params.systemPrompt,
             disableSession: params.disableSession,
+            extraArgs: params.extraArgs,
           },
         );
         retryArgs = retry.args;

package/src/agent/internalRunner.js

@@ -96,7 +96,18 @@ function drainQueue(queueFile) {
   return content.split(/\r?\n/).filter(Boolean);
 }
 
-async function handleEvent(projectRoot, agentType, provider, model, subscriber, nickname, evt, cliSessionState, busSender) {
+async function handleEvent(
+  projectRoot,
+  agentType,
+  provider,
+  model,
+  subscriber,
+  nickname,
+  evt,
+  cliSessionState,
+  busSender,
+  extraArgs = []
+) {
   if (!evt || !evt.data || !evt.data.message) return;
   const prompt = evt.data.message;
   const publisher = evt.publisher || "unknown";
@@ -118,6 +129,7 @@ async function handleEvent(projectRoot, agentType, provider, model, subscriber,
     sessionId: cliSessionState.cliSessionId,
     sandbox,
     cwd: projectRoot,
+    extraArgs,
     onStreamDelta: emitStreamDelta,
   });
 
@@ -136,6 +148,7 @@ async function handleEvent(projectRoot, agentType, provider, model, subscriber,
         sessionId: null, // Let runCliAgent generate new session
         sandbox,
         cwd: projectRoot,
+        extraArgs,
         onStreamDelta: emitStreamDelta,
       });
     }
@@ -175,7 +188,7 @@ async function handleEvent(projectRoot, agentType, provider, model, subscriber,
   await busSender.flush();
 }
 
-async function runInternalRunner({ projectRoot, agentType = "codex" }) {
+async function runInternalRunner({ projectRoot, agentType = "codex", extraArgs = [] }) {
   // Internal runner 必须由 daemon 启动，UFOO_SUBSCRIBER_ID 应该已经设置
   const { subscriber, agentType: parsedAgentType, sessionId } = parseSubscriberId();
   const nickname = process.env.UFOO_NICKNAME || "";
@@ -280,7 +293,8 @@ async function runInternalRunner({ projectRoot, agentType = "codex" }) {
               nickname,
               evt,
               cliSessionState,
-              busSender
+              busSender,
+              extraArgs
             );
           }
 

package/src/agent/ptyRunner.js

@@ -113,24 +113,25 @@ function buildPrompt(text, marker) {
   return `${text}\n\n请在完成后输出以下标记（单独一行）：\n${marker}\n`;
 }
 
-function resolveCommand(agentType) {
+function resolveCommand(agentType, extraArgs = []) {
   const normalizedAgent = String(agentType || "").trim().toLowerCase();
+  const extra = Array.isArray(extraArgs) ? extraArgs : [];
   const rawCmd = String(process.env.UFOO_PTY_CMD || "").trim();
   if (rawCmd) {
     const rawArgs = String(process.env.UFOO_PTY_ARGS || "").trim();
     const args = rawArgs ? rawArgs.split(/\s+/).filter(Boolean) : [];
-    return { command: rawCmd, args };
+    return { command: rawCmd, args: [...args, ...extra] };
   }
   if (normalizedAgent === "claude" || normalizedAgent === "claude-code") {
-    return { command: "claude", args: [] };
+    return { command: "claude", args: [...extra] };
   }
   if (normalizedAgent === "ufoo" || normalizedAgent === "ucode" || normalizedAgent === "ufoo-code") {
-    return { command: "ucode", args: [] };
+    return { command: "ucode", args: [...extra] };
   }
-  return { command: "codex", args: ["--no-alt-screen", "--sandbox", "workspace-write"] };
+  return { command: "codex", args: ["--no-alt-screen", "--sandbox", "workspace-write", ...extra] };
 }
 
-async function runPtyRunner({ projectRoot, agentType = "codex" }) {
+async function runPtyRunner({ projectRoot, agentType = "codex", extraArgs = [] }) {
   let pty;
   try {
     // eslint-disable-next-line global-require
@@ -156,7 +157,7 @@ async function runPtyRunner({ projectRoot, agentType = "codex" }) {
   const logFile = path.join(runDir, "pty-runner.log");
   const injectSockPath = path.join(queueDir, "inject.sock");
 
-  const { command, args } = resolveCommand(agentType);
+  const { command, args } = resolveCommand(agentType, extraArgs);
   const env = {
     ...process.env,
     UFOO_LAUNCH_MODE: "internal-pty",

package/src/daemon/index.js

@@ -1342,8 +1342,11 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
             : null,
       };
       let soloLaunchBootstrap = null;
-      if (requestedProfile && normalizedAgent === "ufoo") {
-        const soloNickname = explicitNickname || "ucode";
+      if (requestedProfile && (normalizedAgent === "ufoo" || normalizedAgent === "claude" || normalizedAgent === "codex")) {
+        const agentTypeMap = { ufoo: "ufoo-code", claude: "claude-code", codex: "codex" };
+        const defaultNickMap = { ufoo: "ucode", claude: "claude", codex: "codex" };
+        const agentTypeForBootstrap = agentTypeMap[normalizedAgent];
+        const soloNickname = explicitNickname || defaultNickMap[normalizedAgent];
         const profileResult = resolveSoloPromptProfile(projectRoot, requestedProfile);
         if (!profileResult.ok) {
           socket.write(
@@ -1357,17 +1360,36 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
         }
         const built = buildSoloBootstrap({
           nickname: soloNickname,
-          agentType: "ufoo-code",
+          agentType: agentTypeForBootstrap,
           requestedProfile: profileResult.requested_profile,
           profile: profileResult.profile,
         });
         if (built.required) {
           try {
-            const prepared = prepareSoloUcodeBootstrap(projectRoot, soloNickname, built.promptText);
-            op.extra_env = {
-              ...(op.extra_env && typeof op.extra_env === "object" ? op.extra_env : {}),
-              UFOO_UCODE_BOOTSTRAP_FILE: prepared.file,
-            };
+            if (normalizedAgent === "ufoo") {
+              // ucode: bootstrap via env var pointing to file
+              const prepared = prepareSoloUcodeBootstrap(projectRoot, soloNickname, built.promptText);
+              op.extra_env = {
+                ...(op.extra_env && typeof op.extra_env === "object" ? op.extra_env : {}),
+                UFOO_UCODE_BOOTSTRAP_FILE: prepared.file,
+              };
+            } else if (normalizedAgent === "claude") {
+              // claude-code: bootstrap via --append-system-prompt file
+              const bootstrapDir = path.join(getUfooPaths(projectRoot).agentDir, "claude-code", "solo");
+              fs.mkdirSync(bootstrapDir, { recursive: true });
+              const bootstrapFile = path.join(bootstrapDir, `${soloNickname}.bootstrap.md`);
+              fs.writeFileSync(bootstrapFile, built.promptText, "utf8");
+              op.extra_args = [
+                ...(Array.isArray(op.extra_args) ? op.extra_args : []),
+                "--append-system-prompt", bootstrapFile,
+              ];
+            } else if (normalizedAgent === "codex") {
+              // codex: bootstrap via initial prompt argument
+              op.extra_args = [
+                ...(Array.isArray(op.extra_args) ? op.extra_args : []),
+                built.promptText,
+              ];
+            }
             soloLaunchBootstrap = {
               requested_profile: profileResult.requested_profile,
               resolved_profile: profileResult.profile.id,
@@ -1377,7 +1399,7 @@ function startDaemon({ projectRoot, provider, model, resumeMode = "auto" }) {
             socket.write(
               `${JSON.stringify({
                 type: IPC_RESPONSE_TYPES.ERROR,
-                error: err.message || "failed to prepare ucode bootstrap",
+                error: err.message || "failed to prepare solo bootstrap",
               })}
 `,
             );