@@ -279,6 +279,7 @@ interface TerminalStartInput {
   readonly cols: number;
   readonly rows: number;
   readonly initialCommand?: string;
+  readonly initialCommandShellHistory?: "preserve" | "suppress";
 }
 
 interface TerminalSessionState {
@@ -608,18 +609,34 @@ function formatShellCandidate(candidate: ShellCandidate): string {
 }
 
 function quotePosixShellArgument(value: string): string {
-  return `'${value.replaceAll("'", `'\\''`)}'`;
+  return `'${value.replaceAll("'", "'\"'\"'")}'`;
 }
 
 function posixShellCandidateWithInitialCommand(
   candidate: ShellCandidate,
   initialCommand: string,
+  shellHistory: "preserve" | "suppress" | undefined,
 ): ShellCandidate {
   const baseArgs = candidate.args ?? [];
   const reenterShell = [candidate.shell, ...baseArgs].map(quotePosixShellArgument).join(" ");
+  const shellName = basenameForPlatform(candidate.shell, "linux").toLowerCase();
+  const quotedCommand = quotePosixShellArgument(initialCommand);
+  const recordHistory =
+    shellHistory !== "preserve"
+      ? ""
+      : shellName === "bash"
+        ? `history -s -- ${quotedCommand}; history -a\n`
+        : shellName === "zsh"
+          ? `print -s -- ${quotedCommand}; fc -AI\n`
+          : "";
   return {
     shell: candidate.shell,
-    args: [...baseArgs, "-i", "-c", `trap ':' INT\n${initialCommand}\nexec ${reenterShell}`],
+    args: [
+      ...baseArgs,
+      "-i",
+      "-c",
+      `trap ':' INT\n${recordHistory}${initialCommand}\nexec ${reenterShell}`,
+    ],
   };
 }
 
@@ -2495,7 +2512,11 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
             ) {
               initialCommandHandled = true;
               shellCandidates = resolvedShellCandidates.map((candidate) =>
-                posixShellCandidateWithInitialCommand(candidate, initialCommand),
+                posixShellCandidateWithInitialCommand(
+                  candidate,
+                  initialCommand,
+                  input.initialCommandShellHistory,
+                ),
               );
             }
             const terminalEnv = createTerminalSpawnEnv(
@@ -2953,6 +2974,9 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
           cols,
           rows,
           ...(input.initialCommand ? { initialCommand: input.initialCommand } : {}),
+          ...(input.initialCommandShellHistory
+            ? { initialCommandShellHistory: input.initialCommandShellHistory }
+            : {}),
         },
         "started",
       );
@@ -3004,6 +3028,9 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
           cols: targetCols,
           rows: targetRows,
           ...(input.initialCommand ? { initialCommand: input.initialCommand } : {}),
+          ...(input.initialCommandShellHistory
+            ? { initialCommandShellHistory: input.initialCommandShellHistory }
+            : {}),
         },
         "started",
       );
 
@@ -257,7 +257,8 @@ export function useChatTerminalActions(input: ChatTerminalActionsInput) {
       location: { cwd: targetCwd, worktreePath: targetWorktreePath },
       stopOnSettle: script.stopOnSettle ?? false,
       ...(options?.env ? { extraEnv: options.env } : {}),
-      initialCommand: script.command,
+      ...(script.command.length <= 65_536 ? { initialCommand: script.command } : {}),
+      ...(options?.shellHistory ? { initialCommandShellHistory: options.shellHistory } : {}),
     });
     if (!launched) return;
     const targetTerminalId = launched.terminalId;
 
@@ -90,6 +90,7 @@ export function useThreadTerminalActions(threadRef: ScopedThreadRef | null) {
     readonly stopOnSettle?: boolean;
     readonly size?: { readonly cols: number; readonly rows: number };
     readonly initialCommand?: string;
+    readonly initialCommandShellHistory?: "preserve" | "suppress";
   }) => {
     if (!threadRef || !canWrite() || !project) return null;
     const location = input.location ?? defaultLaunchLocation();
@@ -111,6 +112,9 @@ export function useThreadTerminalActions(threadRef: ScopedThreadRef | null) {
         ...input.size,
         ...(input.stopOnSettle !== undefined ? { stopOnSettle: input.stopOnSettle } : {}),
         ...(input.initialCommand !== undefined ? { initialCommand: input.initialCommand } : {}),
+        ...(input.initialCommandShellHistory
+          ? { initialCommandShellHistory: input.initialCommandShellHistory }
+          : {}),
       },
     });
     return { terminalId, result };
 
@@ -55,7 +55,9 @@ describe("TerminalOpenInput", () => {
       terminalId: DEFAULT_TERMINAL_ID,
       cwd: "/tmp/project",
       initialCommand: "npm run dev",
+      initialCommandShellHistory: "preserve",
     });
     expect(parsed.initialCommand).toBe("npm run dev");
+    expect(parsed.initialCommandShellHistory).toBe("preserve");
   });
 });
@@ -42,6 +42,7 @@ export const TerminalOpenInput = Schema.Struct({
   env: Schema.optional(TerminalEnvSchema),
   providerInstanceId: Schema.optional(ProviderInstanceId),
   stopOnSettle: Schema.optional(Schema.Boolean),
+  initialCommandShellHistory: Schema.optional(Schema.Literals(["preserve", "suppress"])),
   /** Ask the server to run a command during shell startup when supported. */
   initialCommand: Schema.optional(
     Schema.String.check(Schema.isNonEmpty()).check(Schema.isMaxLength(65_536)),