claude-code-kanban 2.3.2 → 3.0.0-rc.1

package/install.js

@@ -9,22 +9,9 @@ const { execSync } = require('child_process');
 const CLAUDE_DIR = path.join(os.homedir(), '.claude');
 const HOOKS_DIR = path.join(CLAUDE_DIR, 'hooks');
 const SETTINGS_PATH = path.join(CLAUDE_DIR, 'settings.json');
-const HOOK_SCRIPT_DEST = path.join(HOOKS_DIR, 'agent-spy.sh');
-const HOOK_SCRIPT_SRC = path.join(__dirname, 'hooks', 'agent-spy.sh');
+const PLUGIN_DIR = path.join(__dirname, 'plugin');
+const CTX_SCRIPT_SRC = path.join(PLUGIN_DIR, 'plugins', 'claude-code-kanban', 'scripts', 'context-status.sh');
 const CTX_SCRIPT_DEST = path.join(HOOKS_DIR, 'context-status.sh');
-const CTX_SCRIPT_SRC = path.join(__dirname, 'hooks', 'context-status.sh');
-const AGENT_ACTIVITY_DIR = path.join(CLAUDE_DIR, 'agent-activity');
-
-const HOOK_COMMAND = '~/.claude/hooks/agent-spy.sh';
-const HOOK_EVENTS = [
-  { event: 'SessionStart' },
-  { event: 'SubagentStart' },
-  { event: 'SubagentStop' },
-  { event: 'TeammateIdle' },
-  { event: 'PermissionRequest' },
-  { event: 'PreToolUse', matcher: 'AskUserQuestion' },
-  { event: 'PostToolUse' },
-];
 
 // ANSI helpers
 const green = s => `\x1b[32m${s}\x1b[0m`;
@@ -43,136 +30,113 @@ function prompt(question) {
   });
 }
 
+function runCLI(cmd, okPatterns = []) {
+  try {
+    const out = execSync(cmd, { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+    return { ok: true, output: out };
+  } catch (e) {
+    const stderr = e.stderr?.trim() || e.message;
+    if (okPatterns.some(p => stderr.includes(p))) return { ok: true, idempotent: true };
+    return { ok: false, error: stderr };
+  }
+}
+
+function copyScript(src, dest) {
+  fs.mkdirSync(path.dirname(dest), { recursive: true });
+  fs.copyFileSync(src, dest);
+  try { fs.chmodSync(dest, 0o755); } catch {}
+}
+
 async function runInstall() {
-  console.log(`\n  ${bold('claude-code-kanban')} — Agent Log hook installer\n`);
+  console.log(`\n  ${bold('claude-code-kanban')} — Plugin & StatusLine installer\n`);
 
-  // 1. Check bash
-  process.stdout.write('  Checking bash... ');
-  try {
-    const bashPath = execSync('which bash', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
-    console.log(green(`✓ found (${bashPath})`));
-  } catch {
-    const shell = process.env.SHELL || process.env.BASH || '';
-    if (shell.includes('bash')) {
-      console.log(green(`✓ found via $SHELL (${shell})`));
-    } else {
-      const currentShell = shell || process.env.ComSpec || 'unknown';
-      console.log(yellow(`⚠ bash not found (current shell: ${currentShell})`));
-      console.log(`    ${dim('Hook scripts use #!/bin/bash and require a bash environment')}`);
-      if (!(await prompt(`    Continue anyway? [Y/n] `))) {
-        console.log(`\n  ${dim('Install cancelled.')}\n`);
-        return;
-      }
-    }
+  // 1. Check prerequisites
+  process.stdout.write('  Checking claude CLI... ');
+  const claude = runCLI('claude --version');
+  if (claude.ok) {
+    console.log(green(`✓ found (${claude.output})`));
+  } else {
+    console.log(red('✗ claude CLI not found'));
+    console.log(`    ${dim('Install Claude Code CLI first: https://docs.anthropic.com/en/docs/claude-code')}`);
+    return;
   }
 
-  // 2. Check jq
   process.stdout.write('  Checking jq... ');
-  try {
-    const ver = execSync('jq --version', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
-    console.log(green(`✓ found (${ver})`));
-  } catch {
-    console.log(yellow('⚠ not found — hook script requires jq for JSON parsing'));
+  const jq = runCLI('jq --version');
+  if (jq.ok) {
+    console.log(green(`✓ found (${jq.output})`));
+  } else {
+    console.log(yellow('⚠ not found — hook scripts require jq for JSON parsing'));
   }
 
-  async function installScript(label, src, dest) {
-    console.log(`\n  ${label}: ${dim(dest)}`);
-    if (fs.existsSync(dest)) {
-      const existing = fs.readFileSync(dest, 'utf8');
-      const bundled = fs.readFileSync(src, 'utf8');
-      if (existing === bundled) {
-        console.log(`    ${green('✓')} Up to date`);
-        return true;
-      }
-      if (await prompt(`    Different version found. Update? [Y/n] `)) {
-        fs.mkdirSync(HOOKS_DIR, { recursive: true });
-        fs.copyFileSync(src, dest);
-        try { fs.chmodSync(dest, 0o755); } catch {}
-        console.log(`    ${green('✓')} Updated`);
-        return true;
-      }
-      console.log(`    ${dim('Skipped')}`);
-      return false;
-    }
-    if (await prompt(`    Not found. Install? [Y/n] `)) {
-      fs.mkdirSync(HOOKS_DIR, { recursive: true });
-      fs.copyFileSync(src, dest);
-      try { fs.chmodSync(dest, 0o755); } catch {}
-      console.log(`    ${green('✓')} Installed and set executable`);
-      return true;
+  // 2. Register marketplace & install plugin via Claude CLI
+  console.log(`\n  Plugin: ${dim(PLUGIN_DIR)}`);
+  if (await prompt(`    Install claude-code-kanban plugin? [Y/n] `)) {
+    process.stdout.write('    Registering marketplace... ');
+    const mkt = runCLI(`claude plugin marketplace add "${PLUGIN_DIR}"`, ['already', 'exists']);
+    if (mkt.ok) {
+      console.log(green(mkt.idempotent ? '✓ already registered' : '✓'));
+    } else {
+      console.log(yellow(`⚠ ${mkt.error}`));
     }
-    console.log(`    ${dim('Skipped')}`);
-    return false;
-  }
-
-  // 3. Hook scripts
-  const hookInstalled = await installScript('Hook script', HOOK_SCRIPT_SRC, HOOK_SCRIPT_DEST);
-  const ctxInstalled = await installScript('Context spy', CTX_SCRIPT_SRC, CTX_SCRIPT_DEST);
 
-  // 4. Settings.json
-  console.log(`\n  Settings: ${dim(SETTINGS_PATH)}`);
-  let settings;
-  try {
-    if (fs.existsSync(SETTINGS_PATH)) {
-      settings = JSON.parse(fs.readFileSync(SETTINGS_PATH, 'utf8'));
+    const inst = runCLI('claude plugin install claude-code-kanban@claude-code-kanban', ['already installed', 'already exists']);
+    if (inst.ok) {
+      console.log(`    ${green('✓')} ${inst.idempotent ? 'Already installed' : 'Plugin installed'}`);
     } else {
-      settings = {};
+      console.log(`    ${red('✗')} Plugin install failed: ${inst.error}`);
     }
-  } catch (e) {
-    console.log(`    ${red('✗')} Malformed JSON in settings.json — aborting settings update`);
-    printSummary(hookInstalled, false);
-    return;
-  }
-
-  if (!settings.hooks) settings.hooks = {};
-
-  const needed = [];
-  for (const { event, matcher } of HOOK_EVENTS) {
-    if (!settings.hooks[event]) settings.hooks[event] = [];
-    const matcherStr = matcher || '';
-    const exists = settings.hooks[event].some(g =>
-      g.matcher === matcherStr && g.hooks?.some(h => h.command === HOOK_COMMAND)
-    );
-    if (!exists) needed.push({ event, matcher: matcherStr });
+  } else {
+    console.log(`    ${dim('Skipped')}`);
   }
 
-  let settingsUpdated = false;
-  if (needed.length === 0) {
-    console.log(`    ${green('✓')} Already configured`);
-    settingsUpdated = true;
-  } else {
-    console.log(`    Adding hooks for: ${needed.map(n => n.matcher ? `${n.event}:${n.matcher}` : n.event).join(', ')}`);
-    if (await prompt(`    Update settings? [Y/n] `)) {
-      for (const { event, matcher } of needed) {
-        settings.hooks[event].push({
-          matcher,
-          hooks: [{ type: 'command', command: HOOK_COMMAND, timeout: 5 }]
-        });
-      }
-      fs.mkdirSync(CLAUDE_DIR, { recursive: true });
-      fs.writeFileSync(SETTINGS_PATH, JSON.stringify(settings, null, 2) + '\n');
-      console.log(`    ${green('✓')} ${needed.length} hook entries added`);
-      settingsUpdated = true;
+  // 3. StatusLine setup (context-status.sh must be copied globally since statusLine is not plugin-scoped)
+  console.log(`\n  Context spy: ${dim(CTX_SCRIPT_DEST)}`);
+  let ctxInstalled = false;
+  if (fs.existsSync(CTX_SCRIPT_DEST)) {
+    const existing = fs.readFileSync(CTX_SCRIPT_DEST, 'utf8');
+    const bundled = fs.readFileSync(CTX_SCRIPT_SRC, 'utf8');
+    if (existing === bundled) {
+      console.log(`    ${green('✓')} Up to date`);
+      ctxInstalled = true;
+    } else if (await prompt(`    Different version found. Update? [Y/n] `)) {
+      copyScript(CTX_SCRIPT_SRC, CTX_SCRIPT_DEST);
+      console.log(`    ${green('✓')} Updated`);
+      ctxInstalled = true;
     } else {
       console.log(`    ${dim('Skipped')}`);
     }
+  } else if (await prompt(`    Not found. Install? [Y/n] `)) {
+    copyScript(CTX_SCRIPT_SRC, CTX_SCRIPT_DEST);
+    console.log(`    ${green('✓')} Installed`);
+    ctxInstalled = true;
+  } else {
+    console.log(`    ${dim('Skipped')}`);
   }
 
-  // 5. StatusLine setup (separate approval)
-  const CTX_COMMAND = '~/.claude/hooks/context-status.sh';
-  let statusLineUpdated = false;
+  // 4. StatusLine config in settings.json
   if (ctxInstalled) {
+    let settings;
+    try {
+      settings = fs.existsSync(SETTINGS_PATH)
+        ? JSON.parse(fs.readFileSync(SETTINGS_PATH, 'utf8'))
+        : {};
+    } catch {
+      console.log(`    ${red('✗')} Malformed JSON in settings.json — skipping statusline config`);
+      printSummary();
+      return;
+    }
+
+    const CTX_COMMAND = '~/.claude/hooks/context-status.sh';
     const hasCtx = settings.statusLine?.command?.includes('context-status.sh');
     if (hasCtx) {
       console.log(`\n  StatusLine: ${green('✓')} Already configured`);
-      statusLineUpdated = true;
     } else if (!settings.statusLine) {
       console.log(`\n  StatusLine: ${dim('not configured')}`);
       if (await prompt(`    Set up context tracking statusline? [Y/n] `)) {
         settings.statusLine = { command: CTX_COMMAND };
         fs.writeFileSync(SETTINGS_PATH, JSON.stringify(settings, null, 2) + '\n');
         console.log(`    ${green('✓')} StatusLine configured`);
-        statusLineUpdated = true;
       } else {
         console.log(`    ${dim('Skipped')}`);
       }
@@ -183,51 +147,55 @@ async function runInstall() {
         settings.statusLine.command = `${CTX_COMMAND} | ${existing}`;
         fs.writeFileSync(SETTINGS_PATH, JSON.stringify(settings, null, 2) + '\n');
         console.log(`    ${green('✓')} StatusLine updated`);
-        statusLineUpdated = true;
       } else {
         console.log(`    ${dim('Skipped')}`);
       }
     }
   }
 
-  printSummary(hookInstalled, settingsUpdated);
+  printSummary();
 }
 
-function printSummary(hookOk, settingsOk) {
-  console.log('');
-  if (hookOk && settingsOk) {
-    console.log(`  ${green('Agent Log will appear in the Kanban footer when subagents are active.')}`);
-  } else {
-    console.log(`  ${yellow('Partial install — re-run --install to complete setup.')}`);
-  }
-  console.log('');
+function printSummary() {
+  console.log(`\n  ${green('Setup complete. Agent activity will appear in the Kanban dashboard.')}\n`);
 }
 
 async function runUninstall() {
-  console.log(`\n  ${bold('claude-code-kanban')} — Agent Log hook uninstaller\n`);
+  console.log(`\n  ${bold('claude-code-kanban')} — Uninstaller\n`);
+
+  // 1. Uninstall plugin via Claude CLI
+  process.stdout.write('  Removing plugin... ');
+  const uninst = runCLI('claude plugin uninstall claude-code-kanban', ['not found', 'not installed']);
+  if (uninst.ok) {
+    console.log(uninst.idempotent ? dim('Not installed') : green('✓ Removed'));
+  } else {
+    console.log(yellow(`⚠ ${uninst.error}`));
+  }
+
+  // 2. Remove marketplace
+  process.stdout.write('  Removing marketplace... ');
+  const rmMkt = runCLI('claude plugin marketplace remove claude-code-kanban', ['not found', 'not configured']);
+  if (rmMkt.ok) {
+    console.log(rmMkt.idempotent ? dim('Not configured') : green('✓ Removed'));
+  } else {
+    console.log(yellow(`⚠ ${rmMkt.error}`));
+  }
+
+  // 3. Remove context-status.sh copy
+  if (fs.existsSync(CTX_SCRIPT_DEST)) {
+    fs.unlinkSync(CTX_SCRIPT_DEST);
+    console.log(`  Context spy: ${green('✓')} Removed`);
+  } else {
+    console.log(`  Context spy: ${dim('Not found')}`);
+  }
 
-  // 1. Remove hook entries from settings.json
+  // 4. Clean up settings.json (statusLine)
   if (fs.existsSync(SETTINGS_PATH)) {
     try {
       const settings = JSON.parse(fs.readFileSync(SETTINGS_PATH, 'utf8'));
-      let removed = 0;
-      if (settings.hooks) {
-        const eventNames = [...new Set(HOOK_EVENTS.map(e => e.event))];
-        for (const event of eventNames) {
-          if (!Array.isArray(settings.hooks[event])) continue;
-          const before = settings.hooks[event].length;
-          settings.hooks[event] = settings.hooks[event].map(g => {
-            if (!g.hooks?.some(h => h.command === HOOK_COMMAND)) return g;
-            const filtered = g.hooks.filter(h => h.command !== HOOK_COMMAND);
-            return filtered.length > 0 ? { ...g, hooks: filtered } : null;
-          }).filter(Boolean);
-          removed += before - settings.hooks[event].length;
-          if (settings.hooks[event].length === 0) delete settings.hooks[event];
-        }
-        if (Object.keys(settings.hooks).length === 0) delete settings.hooks;
-      }
+      let changed = false;
 
-      // Strip context-status.sh from statusLine, restore downstream command if any
+      // Strip context-status.sh from statusLine
       if (settings.statusLine?.command?.includes('context-status.sh')) {
         const cmd = settings.statusLine.command;
         const stripped = cmd.replace(/~\/\.claude\/hooks\/context-status\.sh\s*\|\s*/, '').trim();
@@ -238,43 +206,15 @@ async function runUninstall() {
           delete settings.statusLine;
           console.log(`  StatusLine: ${green('✓')} Removed`);
         }
+        changed = true;
       }
 
-      fs.writeFileSync(SETTINGS_PATH, JSON.stringify(settings, null, 2) + '\n');
-      if (removed > 0) {
-        console.log(`  Settings: ${green('✓')} Removed ${removed} hook entries`);
-      } else {
-        console.log(`  Settings: ${dim('No hook entries found')}`);
+      if (changed) {
+        fs.writeFileSync(SETTINGS_PATH, JSON.stringify(settings, null, 2) + '\n');
       }
     } catch {
       console.log(`  Settings: ${red('✗')} Could not parse settings.json`);
     }
-  } else {
-    console.log(`  Settings: ${dim('No settings.json found')}`);
-  }
-
-  // 2. Remove hook scripts
-  if (fs.existsSync(HOOK_SCRIPT_DEST)) {
-    fs.unlinkSync(HOOK_SCRIPT_DEST);
-    console.log(`  Hook script: ${green('✓')} Removed`);
-  } else {
-    console.log(`  Hook script: ${dim('Not found')}`);
-  }
-  if (fs.existsSync(CTX_SCRIPT_DEST)) {
-    fs.unlinkSync(CTX_SCRIPT_DEST);
-    console.log(`  Context spy: ${green('✓')} Removed`);
-  } else {
-    console.log(`  Context spy: ${dim('Not found')}`);
-  }
-
-  // 3. Optionally remove agent-activity data
-  if (fs.existsSync(AGENT_ACTIVITY_DIR)) {
-    if (await prompt(`\n  Remove agent activity data (${AGENT_ACTIVITY_DIR})? [y/N] `)) {
-      fs.rmSync(AGENT_ACTIVITY_DIR, { recursive: true, force: true });
-      console.log(`  ${green('✓')} Agent activity data removed`);
-    } else {
-      console.log(`  ${dim('Kept agent activity data')}`);
-    }
   }
 
   console.log(`\n  ${green('Uninstall complete.')}\n`);

package/lib/parsers.js

@@ -172,7 +172,7 @@ function readCustomTitle(jsonlPath, existingStat) {
 }
 
 function readSessionInfoFromJsonl(jsonlPath) {
-  const result = { slug: null, projectPath: null, gitBranch: null, customTitle: null };
+  const result = { slug: null, projectPath: null, cwd: null, gitBranch: null, customTitle: null };
   let stat;
   try {
     stat = statSync(jsonlPath);
@@ -182,16 +182,22 @@ function readSessionInfoFromJsonl(jsonlPath) {
 
     const headBuf = Buffer.alloc(Math.min(HEAD_SIZE, stat.size));
     const hn = fs.readSync(fd, headBuf, 0, headBuf.length, 0);
+    let lastCwdFromHead = null;
     for (const line of headBuf.toString('utf8', 0, hn).split('\n')) {
       try {
         const data = JSON.parse(line);
         if (data.slug) result.slug = data.slug;
-        if (data.cwd) result.projectPath = data.cwd;
+        if (data.cwd) {
+          if (!result.projectPath) result.projectPath = data.cwd;
+          lastCwdFromHead = data.cwd;
+        }
         if (data.gitBranch) result.gitBranch = data.gitBranch;
         if (result.slug && result.projectPath && result.gitBranch) break;
       } catch (e) {}
     }
 
+    result.cwd = lastCwdFromHead;
+
     if ((!result.slug || !result.projectPath || !result.gitBranch) && stat.size > HEAD_SIZE) {
       const tailStart = stat.size - TAIL_SIZE;
       const tailBuf = Buffer.alloc(TAIL_SIZE);
@@ -203,6 +209,7 @@ function readSessionInfoFromJsonl(jsonlPath) {
           if (!result.slug && data.slug) result.slug = data.slug;
           if (!result.projectPath && data.cwd) result.projectPath = data.cwd;
           if (!result.gitBranch && data.gitBranch) result.gitBranch = data.gitBranch;
+          if (!result.cwd && data.cwd) result.cwd = data.cwd;
           if (result.slug && result.projectPath && result.gitBranch) break;
         } catch (e) {}
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-code-kanban",
-  "version": "2.3.2",
+  "version": "3.0.0-rc.1",
   "description": "A web-based Kanban board for viewing Claude Code tasks with agent teams support",
   "main": "server.js",
   "bin": {
@@ -45,8 +45,7 @@
   "files": [
     "server.js",
     "install.js",
-    "hooks/agent-spy.sh",
-    "hooks/context-status.sh",
+    "plugin/**/*",
     "lib/**/*",
     "public/**/*"
   ],

package/plugin/.claude-plugin/marketplace.json

@@ -0,0 +1,13 @@
+{
+  "name": "claude-code-kanban",
+  "owner": {
+    "name": "NikiforovAll"
+  },
+  "plugins": [
+    {
+      "name": "claude-code-kanban",
+      "source": "./plugins/claude-code-kanban",
+      "description": "Agent activity tracking for claude-code-kanban dashboard"
+    }
+  ]
+}

package/plugin/plugins/claude-code-kanban/.claude-plugin/plugin.json

@@ -0,0 +1,6 @@
+{
+  "name": "claude-code-kanban",
+  "version": "1.0.0",
+  "description": "Agent activity tracking for claude-code-kanban dashboard",
+  "hooks": "./hooks/hooks.json"
+}

package/plugin/plugins/claude-code-kanban/hooks/hooks.json

@@ -0,0 +1,88 @@
+{
+  "hooks": {
+    "SessionStart": [
+      {
+        "matcher": "",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "${CLAUDE_PLUGIN_ROOT}/scripts/agent-spy.sh",
+            "timeout": 5
+          }
+        ]
+      }
+    ],
+    "SubagentStart": [
+      {
+        "matcher": "",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "${CLAUDE_PLUGIN_ROOT}/scripts/agent-spy.sh",
+            "timeout": 5
+          }
+        ]
+      }
+    ],
+    "SubagentStop": [
+      {
+        "matcher": "",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "${CLAUDE_PLUGIN_ROOT}/scripts/agent-spy.sh",
+            "timeout": 5
+          }
+        ]
+      }
+    ],
+    "TeammateIdle": [
+      {
+        "matcher": "",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "${CLAUDE_PLUGIN_ROOT}/scripts/agent-spy.sh",
+            "timeout": 5
+          }
+        ]
+      }
+    ],
+    "PermissionRequest": [
+      {
+        "matcher": "",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "${CLAUDE_PLUGIN_ROOT}/scripts/agent-spy.sh",
+            "timeout": 5
+          }
+        ]
+      }
+    ],
+    "PreToolUse": [
+      {
+        "matcher": "AskUserQuestion",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "${CLAUDE_PLUGIN_ROOT}/scripts/agent-spy.sh",
+            "timeout": 5
+          }
+        ]
+      }
+    ],
+    "PostToolUse": [
+      {
+        "matcher": "",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "${CLAUDE_PLUGIN_ROOT}/scripts/agent-spy.sh",
+            "timeout": 5
+          }
+        ]
+      }
+    ]
+  }
+}

package/{hooks → plugin/plugins/claude-code-kanban/scripts}/agent-spy.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Tracks subagent lifecycle: one JSON file per agent, grouped by session
-# Layout: ~/.claude/agent-activity/{sessionId}/{agentId}.json
+# Layout: ~/.claude/.cck/agent-activity/{sessionId}/{agentId}.json
 
 INPUT=$(cat)
 
@@ -16,12 +16,14 @@ eval "$(echo "$INPUT" | jq -r '
 
 [ -z "$SESSION_ID" ] && exit 0
 
+CCK_ACTIVITY="$HOME/.claude/.cck/agent-activity"
+
 # Map session to custom task list on session start
 if [ "$EVENT" = "SessionStart" ]; then
   TASK_LIST_ID="${CLAUDE_CODE_TASK_LIST_ID:-}"
   if [ -n "$TASK_LIST_ID" ]; then
     CWD=$(echo "$INPUT" | jq -r '.cwd // ""')
-    MAPS_DIR="$HOME/.claude/agent-activity/_task-maps"
+    MAPS_DIR="$CCK_ACTIVITY/_task-maps"
     mkdir -p "$MAPS_DIR"
     MAP_FILE="$MAPS_DIR/$TASK_LIST_ID.json"
     TMP_FILE="$MAP_FILE.$$"
@@ -36,7 +38,7 @@ fi
 
 # PostToolUse / non-waiting PreToolUse: clear waiting state
 if [ "$EVENT" = "PostToolUse" ] || { [ "$EVENT" = "PreToolUse" ] && [ "$TOOL_NAME" != "AskUserQuestion" ]; }; then
-  WFILE="$HOME/.claude/agent-activity/$SESSION_ID/_waiting.json"
+  WFILE="$CCK_ACTIVITY/$SESSION_ID/_waiting.json"
   rm -f "$WFILE"
   [ "$EVENT" = "PostToolUse" ] && exit 0
 fi
@@ -46,7 +48,7 @@ fi
 
 # Waiting-for-user events → write _waiting.json marker
 if [ "$EVENT" = "PermissionRequest" ] || { [ "$EVENT" = "PreToolUse" ] && [ "$TOOL_NAME" = "AskUserQuestion" ]; }; then
-  DIR="$HOME/.claude/agent-activity/$SESSION_ID"
+  DIR="$CCK_ACTIVITY/$SESSION_ID"
   mkdir -p "$DIR"
   KIND="permission"
   [ "$EVENT" = "PreToolUse" ] && KIND="question"
@@ -63,7 +65,7 @@ fi
 
 # TeammateIdle has no agent_id — resolve via name→id mapping file
 if [ "$EVENT" = "TeammateIdle" ] && [ -z "$AGENT_ID" ] && [ -n "$TEAMMATE_NAME" ]; then
-  DIR="$HOME/.claude/agent-activity/$SESSION_ID"
+  DIR="$CCK_ACTIVITY/$SESSION_ID"
   MAP_FILE="$DIR/_name-${TEAMMATE_NAME}.id"
   [ ! -f "$MAP_FILE" ] && exit 0
   AGENT_ID=$(cat "$MAP_FILE")
@@ -83,7 +85,7 @@ fi
 
 [ -z "$AGENT_ID" ] && exit 0
 
-DIR="$HOME/.claude/agent-activity/$SESSION_ID"
+DIR="$CCK_ACTIVITY/$SESSION_ID"
 FILE="$DIR/$AGENT_ID.json"
 
 # On Start: skip if no type (internal agents like AskUserQuestion)

package/{hooks → plugin/plugins/claude-code-kanban/scripts}/context-status.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Statusline spy: writes raw context data for kanban dashboard, passes input through
-# Layout: ~/.claude/context-status/{sessionId}.json
+# Layout: ~/.claude/.cck/context-status/{sessionId}.json
 #
 # Usage: pipe before your statusline command:
 #   "command": "~/.claude/hooks/context-status.sh | npx -y ccstatusline@latest"
@@ -9,7 +9,7 @@ INPUT=$(cat)
 
 SESSION_ID=$(echo "$INPUT" | jq -r '.session_id // ""')
 if [ -n "$SESSION_ID" ]; then
-  DIR="$HOME/.claude/context-status"
+  DIR="$HOME/.claude/.cck/context-status"
   mkdir -p "$DIR"
   echo "$INPUT" > "$DIR/$SESSION_ID.json"
 fi

package/public/app.js

@@ -4825,6 +4825,9 @@ function showInfoModal(session, teamConfig, tasks, planContent) {
     const projectName = session.project.split(/[/\\]/).pop();
     infoRows.push(['Project', projectName, { openPath: session.projectDir }]);
     infoRows.push(['Path', session.project, { openPath: session.project }]);
+    if (session.cwd && session.cwd !== session.project) {
+      infoRows.push(['CWD', session.cwd, { openPath: session.cwd }]);
+    }
     if (session.gitBranch) {
       infoRows.push(['Branch', session.gitBranch]);
     }

package/server.js

@@ -64,8 +64,9 @@ const TASKS_DIR = path.join(CLAUDE_DIR, 'tasks');
 const PROJECTS_DIR = path.join(CLAUDE_DIR, 'projects');
 const TEAMS_DIR = path.join(CLAUDE_DIR, 'teams');
 const PLANS_DIR = path.join(CLAUDE_DIR, 'plans');
-const AGENT_ACTIVITY_DIR = path.join(CLAUDE_DIR, 'agent-activity');
-const CONTEXT_STATUS_DIR = path.join(CLAUDE_DIR, 'context-status');
+const CCK_DIR = path.join(CLAUDE_DIR, '.cck');
+const AGENT_ACTIVITY_DIR = path.join(CCK_DIR, 'agent-activity');
+const CONTEXT_STATUS_DIR = path.join(CCK_DIR, 'context-status');
 
 const PERMISSION_TTL_MS = 1800000;
 const AGENT_TTL_MS = 3600000;
@@ -359,6 +360,20 @@ function loadSessionMetadata() {
       const files = readdirSync(projectPath).filter(f => f.endsWith('.jsonl'));
       const sessionIds = [];
 
+      // Read sessions-index.json first for canonical projectPath
+      let indexProjectPath = null;
+      const indexPath = path.join(projectPath, 'sessions-index.json');
+      let indexEntries = [];
+      if (existsSync(indexPath)) {
+        try {
+          const indexData = JSON.parse(readFileSync(indexPath, 'utf8'));
+          indexEntries = indexData.entries || [];
+          for (const entry of indexEntries) {
+            if (entry.projectPath) { indexProjectPath = entry.projectPath; break; }
+          }
+        } catch (e) {}
+      }
+
       // First pass: read all JSONL files
       let resolvedProjectPath = null;
       for (const file of files) {
@@ -372,7 +387,8 @@ function loadSessionMetadata() {
 
         metadata[sessionId] = {
           slug: sessionInfo.slug,
-          project: sessionInfo.projectPath || null,
+          project: indexProjectPath || sessionInfo.projectPath || null,
+          cwd: sessionInfo.cwd || null,
           gitBranch: sessionInfo.gitBranch || null,
           customTitle: sessionInfo.customTitle || null,
           jsonlPath: jsonlPath
@@ -381,38 +397,30 @@ function loadSessionMetadata() {
       }
 
       // Second pass: fill in missing project paths from siblings
-      if (resolvedProjectPath) {
+      const canonicalProject = indexProjectPath || resolvedProjectPath;
+      if (canonicalProject) {
         for (const sid of sessionIds) {
           if (!metadata[sid].project) {
-            metadata[sid].project = resolvedProjectPath;
+            metadata[sid].project = canonicalProject;
           }
         }
       }
 
-      // Also check sessions-index.json for custom names (if /rename was used)
-      const indexPath = path.join(projectPath, 'sessions-index.json');
-      if (existsSync(indexPath)) {
-        try {
-          const indexData = JSON.parse(readFileSync(indexPath, 'utf8'));
-          const entries = indexData.entries || [];
-
-          for (const entry of entries) {
-            if (entry.sessionId) {
-              if (!metadata[entry.sessionId]) {
-                metadata[entry.sessionId] = {
-                  slug: null,
-                  project: entry.projectPath || null,
-                  jsonlPath: null
-                };
-              }
-              metadata[entry.sessionId].description = entry.description || null;
-              if (entry.gitBranch) metadata[entry.sessionId].gitBranch = entry.gitBranch;
-              if (entry.customTitle) metadata[entry.sessionId].customTitle = entry.customTitle;
-              metadata[entry.sessionId].created = entry.created || null;
-            }
+      // Apply index metadata (descriptions, custom titles, etc.)
+      for (const entry of indexEntries) {
+        if (entry.sessionId) {
+          if (!metadata[entry.sessionId]) {
+            metadata[entry.sessionId] = {
+              slug: null,
+              project: indexProjectPath || entry.projectPath || null,
+              cwd: null,
+              jsonlPath: null
+            };
           }
-        } catch (e) {
-          // Skip invalid index files
+          metadata[entry.sessionId].description = entry.description || null;
+          if (entry.gitBranch) metadata[entry.sessionId].gitBranch = entry.gitBranch;
+          if (entry.customTitle) metadata[entry.sessionId].customTitle = entry.customTitle;
+          metadata[entry.sessionId].created = entry.created || null;
         }
       }
     }
@@ -480,6 +488,7 @@ function buildSessionObject(id, meta, overrides = {}) {
     name: getSessionDisplayName(id, meta),
     slug: meta.slug || null,
     project: meta.project || null,
+    cwd: meta.cwd || null,
     description: meta.description || null,
     gitBranch: meta.gitBranch || null,
     customTitle: meta.customTitle || null,