Harden desktop task argument handling

Author: chenbo

apps/desktop/src/main/main.ts

@@ -72,7 +72,7 @@ function registerIpc(): void {
     if (!existsSync(repo)) return { error: `Repository does not exist: ${repo}` };
 
     const command = commandName();
-    const args = ["oc", "run", task, "--repo", repo, "--max-loops", "2"];
+    const args = ["oc", "run", "--repo", repo, "--max-loops", "2", "--", task];
     currentRepo = repo;
     currentTask = spawn(command, args, {
       cwd: repo,
@@ -158,7 +158,7 @@ function formatCommand(command: string, args: string[]): string {
 }
 
 function normalizeTaskForCli(task: string): string {
-  return task.trim().replace(/\s+/gu, " ");
+  return task.trim().replace(/\s+/gu, " ").replaceAll('"', "'");
 }
 
 function quoteArg(value: string): string {

apps/desktop/src/renderer/src/App.tsx

@@ -49,8 +49,8 @@ function App() {
 
   const commandPreview = useMemo(() => {
     const normalizedTask = normalizeTaskForCli(task);
-    if (!repo || !normalizedTask) return 'opencode-plusplus.cmd oc run "<task>" --repo "<repo>" --max-loops 2';
-    return `opencode-plusplus.cmd oc run "${normalizedTask}" --repo "${repo}" --max-loops 2`;
+    if (!repo || !normalizedTask) return 'opencode-plusplus.cmd oc run --repo "<repo>" --max-loops 2 -- "<task>"';
+    return `opencode-plusplus.cmd oc run --repo "${repo}" --max-loops 2 -- "${normalizedTask}"`;
   }, [repo, task]);
 
   if (!bridge) {
@@ -207,7 +207,7 @@ function quoteArg(value: string): string {
 }
 
 function normalizeTaskForCli(task: string): string {
-  return task.trim().replace(/\s+/gu, " ");
+  return task.trim().replace(/\s+/gu, " ").replaceAll('"', "'");
 }
 
 createRoot(document.getElementById("root") as HTMLElement).render(<App />);