coder-config 0.43.14 → 0.43.18

package/lib/constants.js

@@ -2,7 +2,7 @@
  * Constants and tool path configurations
  */
 
-const VERSION = '0.43.14';
+const VERSION = '0.43.18';
 
 // Tool-specific path configurations
 const TOOL_PATHS = {

package/lib/workstreams.js

@@ -186,15 +186,28 @@ function workstreamUse(installDir, idOrName, evalMode = false) {
 
   // Output for eval mode: eval "$(coder-config workstream use name --eval)"
   if (evalMode) {
+    // Output export command and a user-friendly message to stderr
     console.log(`export CODER_WORKSTREAM="${ws.name}"`);
+    console.log(`echo "📂 Workstream: ${ws.name}"`);
     return ws;
   }
 
-  // Normal mode: show instructions
-  console.log(`To activate workstream "${ws.name}", run:`);
-  console.log(`  eval "$(coder-config workstream use ${ws.name} --eval)"`);
-  console.log(`\nOr manually:`);
-  console.log(`  export CODER_WORKSTREAM="${ws.name}"`);
+  // Normal mode: check if cws function exists and give appropriate instructions
+  const cwsInstalled = workstreamCdHookStatus().installed;
+  if (cwsInstalled) {
+    console.log(`Use the cws function to activate workstreams:`);
+    console.log(`  cws ${ws.name}`);
+    console.log('');
+    console.log(`Or if calling directly:`);
+    console.log(`  eval "$(coder-config workstream use ${ws.name} --eval)"`);
+  } else {
+    console.log(`To activate workstream "${ws.name}", install the cd hook first:`);
+    console.log(`  coder-config workstream install-cd-hook`);
+    console.log('');
+    console.log(`Then use: cws ${ws.name}`);
+    console.log('');
+    console.log(`Or manually: export CODER_WORKSTREAM="${ws.name}"`);
+  }
   return ws;
 }
 
@@ -1111,37 +1124,42 @@ function workstreamInstallCdHook() {
     ? path.join(process.env.HOME || '', '.zshrc')
     : path.join(process.env.HOME || '', '.bashrc');
 
-  const hookMarker = '# coder-config workstream cd hook';
+  const hookMarker = '# coder-config workstream hooks';
+  const oldHookMarker = '# coder-config workstream cd hook';
+  const endMarker = '# end coder-config workstream hooks';
+  const oldEndMarker = '# end coder-config workstream cd hook';
+
   const hookCode = `
 ${hookMarker}
-coder_workstream_cd() {
-  # Run cd directly (not in subshell) - if it fails, it prints its own error
-  builtin cd "$@" || return $?
-
-  # Check for matching workstreams
-  local result
-  result=$(coder-config workstream check-folder "$PWD" --json 2>/dev/null)
+# Wrap coder-config to handle 'workstream use' specially (sets env in current shell)
+coder-config() {
+  if [ "$1" = "workstream" ] && [ "$2" = "use" ] && [ -n "$3" ]; then
+    # workstream use <name> - activate in current shell
+    shift 2  # remove 'workstream use'
+    eval "$(command coder-config workstream use "$@" --eval)"
+  else
+    # All other commands - pass through
+    command coder-config "$@"
+  fi
+}
 
+# Auto-activate workstream on cd
+_coder_workstream_cd() {
+  builtin cd "$@" || return $?
+  local result count current
+  result=$(command coder-config workstream check-folder "$PWD" --json 2>/dev/null)
   [ -z "$result" ] && return 0
-
-  local count current
   count=$(echo "$result" | grep -o '"count":[0-9]*' | cut -d: -f2)
   current=$(echo "$result" | grep -o '"current":true' || echo "")
-
-  # Already on matching workstream
   [ -n "$current" ] && return 0
-
   [ "$count" = "0" ] && return 0
-
   if [ "$count" = "1" ]; then
-    # Single match - auto-activate
     local name id
     name=$(echo "$result" | grep -o '"name":"[^"]*"' | head -1 | cut -d'"' -f4)
     id=$(echo "$result" | grep -o '"id":"[^"]*"' | head -1 | cut -d'"' -f4)
     export CODER_WORKSTREAM="$id"
     echo "📂 Workstream: $name"
   elif [ "$count" -gt 1 ]; then
-    # Multiple matches - prompt
     echo "Multiple workstreams match this folder:"
     local i=1
     echo "$result" | grep -o '"name":"[^"]*"' | cut -d'"' -f4 | while read -r name; do
@@ -1154,34 +1172,45 @@ coder_workstream_cd() {
       local id name
       id=$(echo "$result" | grep -o '"id":"[^"]*"' | sed -n "\${choice}p" | cut -d'"' -f4)
       name=$(echo "$result" | grep -o '"name":"[^"]*"' | sed -n "\${choice}p" | cut -d'"' -f4)
-      if [ -n "$id" ]; then
-        export CODER_WORKSTREAM="$id"
-        echo "📂 Workstream: $name"
-      fi
+      [ -n "$id" ] && export CODER_WORKSTREAM="$id" && echo "📂 Workstream: $name"
     fi
   fi
 }
-alias cd='coder_workstream_cd'
-# end coder-config workstream cd hook
+alias cd='_coder_workstream_cd'
+${endMarker}
 `;
 
-  // Check if hook already installed
+  let content = '';
   if (fs.existsSync(rcFile)) {
-    const content = fs.readFileSync(rcFile, 'utf8');
-    if (content.includes(hookMarker)) {
-      console.log('✓ Workstream cd hook already installed');
-      console.log(`  Location: ${rcFile}`);
-      return true;
+    content = fs.readFileSync(rcFile, 'utf8');
+  }
+
+  // Remove old hook block if present (either old or new marker)
+  if (content.includes(oldHookMarker) || content.includes(hookMarker)) {
+    const startMarker = content.includes(hookMarker) ? hookMarker : oldHookMarker;
+    const endMark = content.includes(endMarker) ? endMarker : oldEndMarker;
+    const startIdx = content.indexOf(startMarker);
+    const endIdx = content.indexOf(endMark);
+    if (startIdx !== -1 && endIdx !== -1) {
+      // Remove the block including any leading newline
+      let removeStart = startIdx;
+      if (startIdx > 0 && content[startIdx - 1] === '\n') {
+        removeStart = startIdx - 1;
+      }
+      content = content.slice(0, removeStart) + content.slice(endIdx + endMark.length);
     }
   }
 
-  // Append hook to rc file
-  fs.appendFileSync(rcFile, hookCode);
-  console.log(`✓ Installed workstream cd hook`);
+  // Append new hook
+  fs.writeFileSync(rcFile, content + hookCode);
+  console.log(`✓ Installed workstream hooks`);
   console.log(`  Location: ${rcFile}`);
   console.log('');
   console.log('Restart your shell or run:');
   console.log(`  source ${rcFile}`);
+  console.log('');
+  console.log('Now you can use:');
+  console.log('  coder-config workstream use <name>   # activates in current shell');
 
   return true;
 }
@@ -1201,34 +1230,38 @@ function workstreamUninstallCdHook() {
     return false;
   }
 
-  const content = fs.readFileSync(rcFile, 'utf8');
-  const hookMarker = '# coder-config workstream cd hook';
-  const endMarker = '# end coder-config workstream cd hook';
-
-  if (!content.includes(hookMarker)) {
-    console.log('Workstream cd hook not installed');
-    return false;
+  let content = fs.readFileSync(rcFile, 'utf8');
+
+  // Support both old and new marker names
+  const markers = [
+    { start: '# coder-config workstream hooks', end: '# end coder-config workstream hooks' },
+    { start: '# coder-config workstream cd hook', end: '# end coder-config workstream cd hook' },
+  ];
+
+  let found = false;
+  for (const { start, end } of markers) {
+    if (content.includes(start)) {
+      const startIdx = content.indexOf(start);
+      const endIdx = content.indexOf(end);
+      if (startIdx !== -1 && endIdx !== -1) {
+        let removeStart = startIdx;
+        if (startIdx > 0 && content[startIdx - 1] === '\n') {
+          removeStart = startIdx - 1;
+        }
+        content = content.slice(0, removeStart) + content.slice(endIdx + end.length);
+        found = true;
+      }
+    }
   }
 
-  // Remove the hook block
-  const startIdx = content.indexOf(hookMarker);
-  const endIdx = content.indexOf(endMarker);
-
-  if (startIdx === -1 || endIdx === -1) {
-    console.error('Could not find hook boundaries');
+  if (!found) {
+    console.log('Workstream hooks not installed');
     return false;
   }
 
-  // Find the newline before the marker (to remove leading blank line)
-  let removeStart = startIdx;
-  if (startIdx > 0 && content[startIdx - 1] === '\n') {
-    removeStart = startIdx - 1;
-  }
-
-  const newContent = content.slice(0, removeStart) + content.slice(endIdx + endMarker.length);
-  fs.writeFileSync(rcFile, newContent);
+  fs.writeFileSync(rcFile, content);
 
-  console.log(`✓ Uninstalled workstream cd hook from ${rcFile}`);
+  console.log(`✓ Uninstalled workstream hooks from ${rcFile}`);
   console.log('');
   console.log('Restart your shell or run:');
   console.log(`  source ${rcFile}`);
@@ -1251,7 +1284,9 @@ function workstreamCdHookStatus() {
   }
 
   const content = fs.readFileSync(rcFile, 'utf8');
-  const installed = content.includes('# coder-config workstream cd hook');
+  // Check for both old and new markers
+  const installed = content.includes('# coder-config workstream hooks') ||
+                    content.includes('# coder-config workstream cd hook');
 
   return { installed, shell: isZsh ? 'zsh' : 'bash', rcFile };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coder-config",
-  "version": "0.43.14",
+  "version": "0.43.18",
   "description": "Configuration manager for AI coding tools - Claude Code, Gemini CLI, Codex CLI, Antigravity. Manage MCPs, rules, permissions, memory, and workstreams.",
   "author": "regression.io",
   "main": "config-loader.js",