Merge pull request #68 from odefun/feat/plan-mode-parity-071449

feat: align plan mode behavior across providers

Author: LIU9293

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ode",
-  "version": "0.0.40",
+  "version": "0.0.41",
   "description": "Ode - OpenCode chat controller for Slack",
   "module": "packages/core/index.ts",
   "type": "module",

packages/agents/claude/client.ts

@@ -205,6 +205,13 @@ export function buildClaudeCommand(
   return { args, command };
 }
 
+function resolveClaudePermissionMode(agent?: string): string | undefined {
+  if (agent?.trim().toLowerCase() === "plan") {
+    return "plan";
+  }
+  return undefined;
+}
+
 function getRecordSessionId(record: ClaudeJsonRecord, fallbackSessionId: string): string {
   return typeof record.session_id === "string" ? record.session_id : fallbackSessionId;
 }
@@ -379,12 +386,15 @@ async function runClaudeWithFallback(
   cwd: string,
   env: SessionEnvironment,
   entry: { controller: AbortController; process?: ChildProcess },
+  forcedPermissionMode?: string,
   onRecord?: (record: ClaudeJsonRecord) => void
 ): Promise<{ output: string; permissionMode: string; command: string }> {
   const isRoot = typeof process.getuid === "function" && process.getuid() === 0;
-  const modes = isRoot
-    ? ["dontAsk", "acceptEdits", "default"]
-    : ["bypassPermissions", "dontAsk", "acceptEdits", "default"];
+  const modes = forcedPermissionMode
+    ? [forcedPermissionMode]
+    : (isRoot
+      ? ["dontAsk", "acceptEdits", "default"]
+      : ["bypassPermissions", "dontAsk", "acceptEdits", "default"]);
   let lastError: Error | null = null;
 
   for (const mode of modes) {
@@ -450,6 +460,7 @@ export async function sendMessage(
   try {
     return await withSessionLock(sessionKey, async () => {
       const agent = options?.agent;
+      const forcedPermissionMode = resolveClaudePermissionMode(agent);
 
       const parts = buildPromptParts(channelId, message, { ...options, agent }, context);
       const prompt = buildPromptText(parts);
@@ -484,6 +495,7 @@ export async function sendMessage(
         workingPath,
         envOverrides,
         entry,
+        forcedPermissionMode,
         (record) => {
           publishClaudeRecordAsSessionEvents(record, sessionId);
         }

packages/agents/codex/client.ts

@@ -118,14 +118,19 @@ export function buildCodexCommandArgs(params: {
   sessionId: string;
   prompt: string;
   model?: string;
+  planMode?: boolean;
 }): string[] {
   const args = [
     "exec",
     "resume",
     "--json",
-    "--full-auto",
     "--skip-git-repo-check",
   ];
+  if (params.planMode) {
+    args.push("--sandbox", "read-only");
+  } else {
+    args.push("--full-auto");
+  }
   if (params.model) {
     args.push("--model", params.model);
   }
@@ -357,6 +362,7 @@ export async function sendMessage(
     await syncCodexModelsFromCache();
     return await withSessionLock(sessionKey, async () => {
       const agent = options?.agent;
+      const planMode = agent?.trim().toLowerCase() === "plan";
       const parts = buildPromptParts(channelId, message, { ...options, agent }, context);
       const prompt = buildPromptText(parts);
       const systemPrompt = buildSystemPrompt(context?.slack);
@@ -367,6 +373,7 @@ export async function sendMessage(
         sessionId,
         prompt: codexPrompt,
         model,
+        planMode,
       });
 
       const command = buildCodexCommand(args);

packages/agents/kimi/client.ts

@@ -61,6 +61,21 @@ function formatShellCommand(args: string[]): string {
     .join(" ");
 }
 
+const KIMI_PLAN_SYSTEM_PROMPT = [
+  "PLAN MODE REQUIREMENT:",
+  "- This turn is planning-only.",
+  "- Do not modify files.",
+  "- Do not execute shell commands.",
+  "- Return an implementation plan and risk notes.",
+].join("\n");
+
+function buildKimiSystemPrompt(baseSystemPrompt: string, agent?: string): string {
+  if (agent?.trim().toLowerCase() !== "plan") {
+    return baseSystemPrompt;
+  }
+  return `${baseSystemPrompt}\n\n${KIMI_PLAN_SYSTEM_PROMPT}`;
+}
+
 export function buildKimiCommandArgs(params: {
   sessionId: string;
   workingPath: string;
@@ -292,7 +307,7 @@ export async function sendMessage(
       const agent = options?.agent;
       const parts = buildPromptParts(channelId, message, { ...options, agent }, context);
       const prompt = buildPromptText(parts);
-      const systemPrompt = buildSystemPrompt(context?.slack);
+      const systemPrompt = buildKimiSystemPrompt(buildSystemPrompt(context?.slack), agent);
       const kimiPrompt = `<system-prompt>\n${systemPrompt}\n</system-prompt>\n\n${prompt}`;
 
       const args = buildKimiCommandArgs({

packages/agents/qwen/client.ts

@@ -86,13 +86,18 @@ export function buildQwenCommandArgs(params: {
   sessionId: string;
   isNewSession: boolean;
   prompt: string;
+  approvalMode?: "plan";
 }): string[] {
   const args = [
     "--output-format",
     "stream-json",
     "--include-partial-messages",
-    "--yolo",
   ];
+  if (params.approvalMode === "plan") {
+    args.push("--approval-mode", "plan");
+  } else {
+    args.push("--yolo");
+  }
   if (!params.isNewSession) {
     args.push("--resume", params.sessionId);
   }
@@ -343,6 +348,7 @@ export async function sendMessage(
   try {
     return await withSessionLock(sessionKey, async () => {
       const agent = options?.agent;
+      const approvalMode = agent?.trim().toLowerCase() === "plan" ? "plan" : undefined;
       const parts = buildPromptParts(channelId, message, { ...options, agent }, context);
       const prompt = buildPromptText(parts);
       const systemPrompt = buildSystemPrompt(context?.slack);
@@ -353,6 +359,7 @@ export async function sendMessage(
         sessionId,
         isNewSession,
         prompt: qwenPrompt,
+        approvalMode,
       });
       const command = buildQwenCommand(args);
       const envOverrides = sessionEnvironments.get(sessionId) ?? {};

packages/agents/test/cli-command.test.ts

@@ -5,6 +5,7 @@ import { buildClaudeCommand, buildClaudeCommandArgs } from "../claude/client";
 import { buildCodexCommand, buildCodexCommandArgs } from "../codex/client";
 import { buildKimiCommand, buildKimiCommandArgs } from "../kimi/client";
 import { buildKiroCommand, buildKiroCommandArgs } from "../kiro/client";
+import { buildQwenCommand, buildQwenCommandArgs } from "../qwen/client";
 
 describe("agent cli command formatting", () => {
   it("builds the final Claude CLI command", () => {
@@ -89,6 +90,23 @@ describe("agent cli command formatting", () => {
     expect(command).toContain("'hello from codex'");
   });
 
+  it("builds the Codex plan command", () => {
+    const args = buildCodexCommandArgs({
+      sessionId: "session-3",
+      model: "gpt-5-codex",
+      prompt: "plan this change",
+      planMode: true,
+    });
+    const command = buildCodexCommand(args);
+
+    expect(command).toContain("codex exec resume");
+    expect(command).toContain("--json");
+    expect(command).toContain("--sandbox read-only");
+    expect(command).not.toContain("--full-auto");
+    expect(command).toContain("session-3");
+    expect(command).toContain("'plan this change'");
+  });
+
   it("builds the Kimi print command", () => {
     const args = buildKimiCommandArgs({
       sessionId: "session-4",
@@ -119,4 +137,31 @@ describe("agent cli command formatting", () => {
     expect(command).toContain("--agent plan");
     expect(command).toContain("'hello from kiro'");
   });
+
+  it("builds the Qwen plan-mode command", () => {
+    const args = buildQwenCommandArgs({
+      sessionId: "session-5",
+      isNewSession: false,
+      prompt: "plan migration",
+      approvalMode: "plan",
+    });
+    const command = buildQwenCommand(args);
+
+    expect(command).toContain("--approval-mode plan");
+    expect(command).not.toContain("--yolo");
+    expect(command).toContain("--resume session-5");
+    expect(command).toContain("-p 'plan migration'");
+  });
+
+  it("builds the Qwen default automation command", () => {
+    const args = buildQwenCommandArgs({
+      sessionId: "session-6",
+      isNewSession: true,
+      prompt: "implement feature",
+    });
+    const command = buildQwenCommand(args);
+
+    expect(command).toContain("--yolo");
+    expect(command).not.toContain("--approval-mode plan");
+  });
 });

packages/core/runtime.ts

@@ -109,8 +109,8 @@ export function createCoreRuntime(deps: RuntimeDeps) {
       threadHistory,
     });
 
-    const trimmed = text.trim();
-    const agent = /^plan\b/i.test(trimmed) ? "plan" : undefined;
+    const normalizedText = text.trimStart().toLowerCase();
+    const agent = /^plan\b/.test(normalizedText) ? "plan" : undefined;
     const providerId = deps.agent.getProviderForSession(sessionId);
     const channelModel = getChannelModel(channelId)?.trim();
     const codexModel = providerId === "codex"

packages/core/runtime/selection-reply.ts

@@ -85,7 +85,8 @@ export async function handleSelectionReply(params: HandleSelectionReplyParams):
   }
 
   const threadOwnerUserId = session?.threadOwnerUserId ?? userId;
-  const agent = /^plan\b/i.test(selection.trim()) ? "plan" : undefined;
+  const normalizedSelection = selection.trimStart().toLowerCase();
+  const agent = /^plan\b/.test(normalizedSelection) ? "plan" : undefined;
   const providerId = deps.agent.getProviderForSession(sessionId);
   const channelModel = getChannelModel(channelId)?.trim();
   const codexModel = providerId === "codex"