Pass permission mode through session resume and creation

lint

Author: charlesvien

apps/twig/src/main/services/agent/schemas.ts

@@ -25,6 +25,8 @@ export const sessionConfigSchema = z.object({
   adapter: z.enum(["claude", "codex"]).optional(),
   /** Additional directories Claude can access beyond cwd (for worktree support) */
   additionalDirectories: z.array(z.string()).optional(),
+  /** Permission mode to use for the session (e.g. "default", "acceptEdits", "plan", "bypassPermissions") */
+  permissionMode: z.string().optional(),
 });
 
 export type SessionConfig = z.infer<typeof sessionConfigSchema>;
@@ -157,6 +159,7 @@ export const reconnectSessionInput = z.object({
   adapter: z.enum(["claude", "codex"]).optional(),
   /** Additional directories Claude can access beyond cwd (for worktree support) */
   additionalDirectories: z.array(z.string()).optional(),
+  permissionMode: z.string().optional(),
 });
 
 export type ReconnectSessionInput = z.infer<typeof reconnectSessionInput>;

apps/twig/src/main/services/agent/service.ts

@@ -176,6 +176,8 @@ interface SessionConfig {
   adapter?: "claude" | "codex";
   /** Additional directories Claude can access beyond cwd (for worktree support) */
   additionalDirectories?: string[];
+  /** Permission mode to use for the session */
+  permissionMode?: string;
 }
 
 interface ManagedSession {
@@ -420,6 +422,7 @@ export class AgentService extends TypedEventEmitter<AgentServiceEvents> {
       sessionId: existingSessionId,
       adapter,
       additionalDirectories,
+      permissionMode,
     } = config;
 
     if (!isRetry) {
@@ -538,6 +541,7 @@ export class AgentService extends TypedEventEmitter<AgentServiceEvents> {
               taskRunId,
               ...(existingSessionId && { sessionId: existingSessionId }),
               systemPrompt,
+              ...(permissionMode && { permissionMode }),
               ...(additionalDirectories?.length && {
                 claudeCode: {
                   options: { additionalDirectories },
@@ -561,6 +565,7 @@ export class AgentService extends TypedEventEmitter<AgentServiceEvents> {
           _meta: {
             taskRunId,
             systemPrompt,
+            ...(permissionMode && { permissionMode }),
             ...(additionalDirectories?.length && {
               claudeCode: {
                 options: { additionalDirectories },
@@ -1279,6 +1284,8 @@ For git operations while detached:
         "additionalDirectories" in params
           ? params.additionalDirectories
           : undefined,
+      permissionMode:
+        "permissionMode" in params ? params.permissionMode : undefined,
     };
   }
 

apps/twig/src/renderer/features/sessions/service/service.ts

@@ -275,6 +275,11 @@ export class SessionService {
     this.subscribeToChannel(taskRunId);
 
     try {
+      const persistedMode = getConfigOptionByCategory(
+        persistedConfigOptions,
+        "mode",
+      )?.currentValue;
+
       const result = await trpcVanilla.agent.reconnect.mutate({
         taskId,
         taskRunId,
@@ -285,6 +290,7 @@ export class SessionService {
         logUrl,
         sessionId,
         adapter: resolvedAdapter,
+        permissionMode: persistedMode,
       });
 
       if (result) {

packages/agent/src/adapters/claude/claude-agent.ts

@@ -138,7 +138,11 @@ export class ClaudeAcpAgent extends BaseAcpAgent {
 
     const meta = params._meta as NewSessionMeta | undefined;
     const internalSessionId = uuidv7();
-    const permissionMode: TwigExecutionMode = "default";
+    const permissionMode: TwigExecutionMode =
+      meta?.permissionMode &&
+      TWIG_EXECUTION_MODES.includes(meta.permissionMode as TwigExecutionMode)
+        ? (meta.permissionMode as TwigExecutionMode)
+        : "default";
 
     const mcpServers = parseMcpServers(params);
     await fetchMcpToolMetadata(mcpServers, this.logger);
@@ -203,10 +207,16 @@ export class ClaudeAcpAgent extends BaseAcpAgent {
     const mcpServers = parseMcpServers(params);
     await fetchMcpToolMetadata(mcpServers, this.logger);
 
+    const permissionMode: TwigExecutionMode =
+      meta?.permissionMode &&
+      TWIG_EXECUTION_MODES.includes(meta.permissionMode as TwigExecutionMode)
+        ? (meta.permissionMode as TwigExecutionMode)
+        : "default";
+
     const { query: q, session } = await this.initializeQuery({
       internalSessionId,
       cwd: params.cwd,
-      permissionMode: "default",
+      permissionMode,
       mcpServers,
       systemPrompt: buildSystemPrompt(meta?.systemPrompt),
       userProvidedOptions: meta?.claudeCode?.options,

packages/agent/src/adapters/claude/types.ts

@@ -55,6 +55,7 @@ export type NewSessionMeta = {
   disableBuiltInTools?: boolean;
   systemPrompt?: unknown;
   sessionId?: string;
+  permissionMode?: string;
   claudeCode?: {
     options?: Options;
   };