code-squad-cli 2.1.1 → 2.1.3

package/dist/index.js

@@ -266,7 +266,7 @@ function shorten(p) {
   const home = os5.homedir();
   return p.startsWith(home) ? "~" + p.slice(home.length) : p;
 }
-function App({ initialWorktrees, root }) {
+function App({ initialWorktrees, root, onSelect }) {
   const { exit } = useApp();
   const [view, setView] = useState("list");
   const [worktrees, setWorktrees] = useState(initialWorktrees);
@@ -294,7 +294,7 @@ function App({ initialWorktrees, root }) {
       } else if (key.downArrow) {
         setCursor((c) => Math.min(worktrees.length - 1, c + 1));
       } else if (key.return && worktrees.length > 0) {
-        process.stdout.write(worktrees[cursor].path + "\n");
+        onSelect(worktrees[cursor].path);
         exit();
       } else if (ch === "n") {
         setView("create");
@@ -322,7 +322,7 @@ function App({ initialWorktrees, root }) {
           if (patterns.length > 0) {
             await copyFilesWithPatterns(root, wtPath, patterns);
           }
-          process.stdout.write(wtPath + "\n");
+          onSelect(wtPath);
           exit();
         }).catch((e) => {
           setMsg({ text: e.message, color: "red" });
@@ -363,12 +363,16 @@ function App({ initialWorktrees, root }) {
 }
 async function runTui(workspaceRoot) {
   const worktrees = await git.listWorktrees(workspaceRoot);
+  let selectedPath = null;
   const fd = fs11.openSync("/dev/tty", "w");
   const ttyStream = new tty.WriteStream(fd);
-  const { waitUntilExit } = render(_jsx(App, { initialWorktrees: worktrees, root: workspaceRoot }), { stdout: ttyStream });
+  const { waitUntilExit } = render(_jsx(App, { initialWorktrees: worktrees, root: workspaceRoot, onSelect: (p) => {
+    selectedPath = p;
+  } }), { stdout: ttyStream });
   await waitUntilExit();
   ttyStream.destroy();
   fs11.closeSync(fd);
+  return selectedPath;
 }
 var git;
 var init_App = __esm({
@@ -2015,7 +2019,10 @@ async function main() {
     default:
       if (process.stdin.isTTY) {
         const { runTui: runTui2 } = await Promise.resolve().then(() => (init_App(), App_exports));
-        await runTui2(workspaceRoot);
+        const selectedPath = await runTui2(workspaceRoot);
+        if (selectedPath) {
+          process.stdout.write(selectedPath + "\n");
+        }
       } else {
         await listWorktrees(workspaceRoot);
       }
@@ -2036,22 +2043,23 @@ csq() {
   fi
 
   local output
-  output=$(command csq "$@" 2>&1)
+  output=$(command csq "$@")
   local exit_code=$?
 
   if [[ $exit_code -ne 0 ]]; then
-    echo "$output"
     return $exit_code
   fi
 
-  # \uB9C8\uC9C0\uB9C9 \uC904\uC774 \uB514\uB809\uD1A0\uB9AC\uBA74 cd
-  local last_line=$(echo "$output" | tail -1)
-  if [[ -d "$last_line" ]]; then
-    # \uB9C8\uC9C0\uB9C9 \uC904 \uC81C\uC678\uD55C \uB098\uBA38\uC9C0 \uCD9C\uB825
-    echo "$output" | sed '$d'
-    cd "$last_line"
-  else
-    echo "$output"
+  # stdout\uC758 \uB9C8\uC9C0\uB9C9 \uC904\uC774 \uB514\uB809\uD1A0\uB9AC\uBA74 cd
+  if [[ -n "$output" ]]; then
+    local last_line=$(echo "$output" | tail -1)
+    if [[ -d "$last_line" ]]; then
+      local rest=$(echo "$output" | sed '$d')
+      [[ -n "$rest" ]] && echo "$rest"
+      cd "$last_line"
+    else
+      echo "$output"
+    fi
   fi
 }
 `.trim();
@@ -2079,9 +2087,9 @@ async function createWorktreeCommand(workspaceRoot, args) {
   const worktreePath = path12.join(defaultBasePath, name);
   try {
     await gitAdapter.createWorktree(worktreePath, name, workspaceRoot);
-    console.log(chalk.green(`\u2713 Created worktree: ${name}`));
+    console.error(chalk.green(`\u2713 Created worktree: ${name}`));
     await copyWorktreeFiles(workspaceRoot, worktreePath);
-    console.log(worktreePath);
+    process.stdout.write(worktreePath + "\n");
   } catch (error) {
     console.error(chalk.red(`Failed to create worktree: ${error.message}`));
     process.exit(1);
@@ -2112,8 +2120,8 @@ async function quitWorktreeCommand() {
   try {
     await gitAdapter.removeWorktree(context.currentPath, context.mainRoot, true);
     await gitAdapter.deleteBranch(context.branch, context.mainRoot, true);
-    console.log(chalk.green(`\u2713 Deleted worktree and branch: ${context.branch}`));
-    console.log(context.mainRoot);
+    console.error(chalk.green(`\u2713 Deleted worktree and branch: ${context.branch}`));
+    process.stdout.write(context.mainRoot + "\n");
   } catch (error) {
     console.error(chalk.red(`Failed to quit: ${error.message}`));
     process.exit(1);
@@ -2127,10 +2135,10 @@ async function copyWorktreeFiles(sourceRoot, destRoot) {
   }
   const { copied, failed } = await copyFilesWithPatterns(sourceRoot, destRoot, patterns);
   if (copied.length > 0) {
-    console.log(chalk.green(`\u2713 Copied ${copied.length} file(s) to worktree`));
+    console.error(chalk.green(`\u2713 Copied ${copied.length} file(s) to worktree`));
   }
   if (failed.length > 0) {
-    console.log(chalk.yellow(`\u26A0 Failed to copy ${failed.length} file(s)`));
+    console.error(chalk.yellow(`\u26A0 Failed to copy ${failed.length} file(s)`));
   }
 }
 main().catch((error) => {

package/dist/tui/App.d.ts

@@ -1 +1 @@
-export declare function runTui(workspaceRoot: string): Promise<void>;
+export declare function runTui(workspaceRoot: string): Promise<string | null>;

package/dist/tui/App.js

@@ -13,7 +13,7 @@ function shorten(p) {
     const home = os.homedir();
     return p.startsWith(home) ? '~' + p.slice(home.length) : p;
 }
-function App({ initialWorktrees, root }) {
+function App({ initialWorktrees, root, onSelect }) {
     const { exit } = useApp();
     const [view, setView] = useState('list');
     const [worktrees, setWorktrees] = useState(initialWorktrees);
@@ -43,7 +43,7 @@ function App({ initialWorktrees, root }) {
                 setCursor(c => Math.min(worktrees.length - 1, c + 1));
             }
             else if (key.return && worktrees.length > 0) {
-                process.stdout.write(worktrees[cursor].path + '\n');
+                onSelect(worktrees[cursor].path);
                 exit();
             }
             else if (ch === 'n') {
@@ -75,7 +75,7 @@ function App({ initialWorktrees, root }) {
                     if (patterns.length > 0) {
                         await copyFilesWithPatterns(root, wtPath, patterns);
                     }
-                    process.stdout.write(wtPath + '\n');
+                    onSelect(wtPath);
                     exit();
                 })
                     .catch((e) => {
@@ -121,12 +121,14 @@ function App({ initialWorktrees, root }) {
 }
 export async function runTui(workspaceRoot) {
     const worktrees = await git.listWorktrees(workspaceRoot);
+    let selectedPath = null;
     // Render to /dev/tty directly — bypasses stdout/stderr capture
     // so shell function's `2>&1` doesn't swallow TUI output
     const fd = fs.openSync('/dev/tty', 'w');
     const ttyStream = new tty.WriteStream(fd);
-    const { waitUntilExit } = render(_jsx(App, { initialWorktrees: worktrees, root: workspaceRoot }), { stdout: ttyStream });
+    const { waitUntilExit } = render(_jsx(App, { initialWorktrees: worktrees, root: workspaceRoot, onSelect: (p) => { selectedPath = p; } }), { stdout: ttyStream });
     await waitUntilExit();
     ttyStream.destroy();
     fs.closeSync(fd);
+    return selectedPath;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-squad-cli",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "type": "module",
   "bin": {
     "csq": "./dist/index.js"