@basestream/cli 0.2.6 → 0.2.7

package/dist/cli.mjs

@@ -252,8 +252,9 @@ var CLAUDE_DIR = path2.join(os2.homedir(), ".claude");
 var CLAUDE_SETTINGS_PATH = path2.join(CLAUDE_DIR, "settings.json");
 var CLAUDE_SKILLS_PATH = path2.join(CLAUDE_DIR, "skills", "bs-summarize.md");
 var CLAUDE_MD_PATH = path2.join(CLAUDE_DIR, "CLAUDE.md");
-var HOOK_COMMAND = "npx @basestream/cli _hook-stop";
+var HOOK_COMMAND = "npx --yes @basestream/cli@latest _hook-stop";
 var HOOK_MARKER = "_hook-stop";
+var HOOK_TIMEOUT = 60;
 var CLAUDE_MD_MARKER = "<!-- basestream -->";
 var CLAUDE_MD_RULE = `${CLAUDE_MD_MARKER}
 - Before starting any non-trivial task, if the reason or context behind the work isn't already clear, ask: "What's the context for this?" Skip this for small tasks, typo fixes, or anything self-explanatory.
@@ -276,6 +277,11 @@ Do not just append \u2014 synthesize everything into a single cohesive summary.
 
 Write the result to \`~/.basestream/sessions/\${CLAUDE_SESSION_ID}-summary.md\`, overwriting the file.
 `;
+var BASESTREAM_DIR2 = path2.join(os2.homedir(), ".basestream");
+var REQUIRED_PERMISSIONS = [
+  `Write(${BASESTREAM_DIR2}/**)`,
+  `Read(${BASESTREAM_DIR2}/**)`
+];
 function injectClaudeMdRule() {
   let existing = "";
   if (fs2.existsSync(CLAUDE_MD_PATH)) {
@@ -313,6 +319,33 @@ function detectClaudeCode() {
     return null;
   }
 }
+function injectPermissions() {
+  const settingsDir = path2.dirname(CLAUDE_SETTINGS_PATH);
+  fs2.mkdirSync(settingsDir, { recursive: true });
+  let settings = {};
+  if (fs2.existsSync(CLAUDE_SETTINGS_PATH)) {
+    try {
+      settings = JSON.parse(fs2.readFileSync(CLAUDE_SETTINGS_PATH, "utf-8"));
+    } catch {
+    }
+  }
+  if (!settings.permissions || typeof settings.permissions !== "object") {
+    settings.permissions = {};
+  }
+  const permissions = settings.permissions;
+  if (!Array.isArray(permissions.allow)) {
+    permissions.allow = [];
+  }
+  const allow = permissions.allow;
+  const missing = REQUIRED_PERMISSIONS.filter((p) => !allow.includes(p));
+  if (missing.length === 0) {
+    check("Claude Code permissions already configured");
+    return;
+  }
+  allow.push(...missing);
+  fs2.writeFileSync(CLAUDE_SETTINGS_PATH, JSON.stringify(settings, null, 2));
+  check("Added ~/.basestream/** permissions to ~/.claude/settings.json");
+}
 function injectClaudeCodeHook() {
   const settingsDir = path2.dirname(CLAUDE_SETTINGS_PATH);
   fs2.mkdirSync(settingsDir, { recursive: true });
@@ -329,52 +362,37 @@ function injectClaudeCodeHook() {
   const hooks = settings.hooks;
   if (Array.isArray(hooks.Stop)) {
     const existing = hooks.Stop;
-    const alreadyInstalled = existing.some(
+    const ourEntryIndex = existing.findIndex(
       (entry) => entry.hooks?.some((h) => h.command?.includes(HOOK_MARKER))
     );
-    if (alreadyInstalled) {
-      check("Claude Code hook already installed");
-    } else {
-      hooks.Stop.push({
-        matcher: "*",
-        hooks: [
-          {
-            type: "command",
-            command: HOOK_COMMAND,
-            timeout: 30
-          }
-        ]
-      });
-    }
-  } else {
-    hooks.Stop = [
-      {
-        matcher: "*",
-        hooks: [
-          {
-            type: "command",
-            command: HOOK_COMMAND,
-            timeout: 30
-          }
-        ]
+    if (ourEntryIndex !== -1) {
+      const entry = existing[ourEntryIndex];
+      const hookIndex = entry.hooks.findIndex((h) => h.command?.includes(HOOK_MARKER));
+      const hook = entry.hooks[hookIndex];
+      if (hook.command === HOOK_COMMAND && hook.timeout === HOOK_TIMEOUT) {
+        check("Claude Code hook already installed");
+        return;
       }
-    ];
-  }
-  if (!settings.permissions || typeof settings.permissions !== "object") {
-    settings.permissions = {};
-  }
-  const permissions = settings.permissions;
-  if (!Array.isArray(permissions.allow)) {
-    permissions.allow = [];
+      hook.command = HOOK_COMMAND;
+      hook.timeout = HOOK_TIMEOUT;
+      fs2.writeFileSync(CLAUDE_SETTINGS_PATH, JSON.stringify(settings, null, 2));
+      check("Updated Claude Code hook to latest command");
+      return;
+    }
   }
-  const allow = permissions.allow;
-  const SKILL_PERMISSIONS2 = [
-    `Write(${os2.homedir()}/.basestream/sessions/**)`,
-    `Read(${os2.homedir()}/.basestream/sessions/**)`
-  ];
-  for (const rule of SKILL_PERMISSIONS2) {
-    if (!allow.includes(rule)) allow.push(rule);
+  if (!Array.isArray(hooks.Stop)) {
+    hooks.Stop = [];
   }
+  hooks.Stop.push({
+    matcher: "*",
+    hooks: [
+      {
+        type: "command",
+        command: HOOK_COMMAND,
+        timeout: HOOK_TIMEOUT
+      }
+    ]
+  });
   fs2.writeFileSync(CLAUDE_SETTINGS_PATH, JSON.stringify(settings, null, 2));
   check("Injected tracking hook into ~/.claude/settings.json");
 }
@@ -388,6 +406,7 @@ async function init() {
   }
   console.log();
   injectClaudeCodeHook();
+  injectPermissions();
   installSkill();
   injectClaudeMdRule();
   ensureDirs();
@@ -395,9 +414,11 @@ async function init() {
   console.log();
   await login();
   console.log();
-  console.log(
-    `  ${c.dim("That's it. Work normally \u2014 every session is now tracked.")}`
-  );
+  console.log(`  ${c.dim("That's it. One last step:")}`);
+  console.log();
+  console.log(`  ${c.bold("Restart Claude Code")} for the hook to take effect.`);
+  console.log();
+  console.log(`  ${c.dim("After that, every session is automatically tracked.")}`);
   console.log();
 }
 
@@ -631,24 +652,34 @@ function categorizeWork(acc) {
   const files = Array.from(acc.filesWritten);
   const fileCount = files.length;
   let category = WorkCategory.OTHER;
-  const testFiles = files.filter(
-    (f) => f.includes(".test.") || f.includes(".spec.") || f.includes("__tests__")
-  );
-  const docFiles = files.filter(
-    (f) => f.endsWith(".md") || f.includes("/docs/")
-  );
-  const configFiles = files.filter(
-    (f) => f.includes("Dockerfile") || f.includes(".yml") || f.includes(".yaml") || f.includes("ci")
-  );
-  if (testFiles.length > fileCount / 2) category = WorkCategory.TESTING;
-  else if (docFiles.length > fileCount / 2) category = WorkCategory.DOCS;
-  else if (configFiles.length > fileCount / 2) category = WorkCategory.DEVOPS;
-  else if (fileCount > 0) category = WorkCategory.FEATURE;
+  if (fileCount > 0) {
+    const testFiles = files.filter(
+      (f) => f.includes(".test.") || f.includes(".spec.") || f.includes("__tests__")
+    );
+    const docFiles = files.filter(
+      (f) => f.endsWith(".md") || f.includes("/docs/")
+    );
+    const configFiles = files.filter(
+      (f) => f.includes("Dockerfile") || f.includes(".yml") || f.includes(".yaml") || f.includes("ci")
+    );
+    if (testFiles.length > fileCount / 2) category = WorkCategory.TESTING;
+    else if (docFiles.length > fileCount / 2) category = WorkCategory.DOCS;
+    else if (configFiles.length > fileCount / 2) category = WorkCategory.DEVOPS;
+    else category = WorkCategory.FEATURE;
+  } else {
+    const tools = acc.toolCalls.map((t) => t.tool);
+    const writeTools = tools.filter(
+      (t) => ["Write", "Edit", "NotebookEdit"].includes(t)
+    );
+    const readTools = tools.filter(
+      (t) => ["Read", "Grep", "Glob", "WebFetch", "WebSearch"].includes(t)
+    );
+    if (writeTools.length > 0) category = WorkCategory.FEATURE;
+    else if (readTools.length > tools.length / 2) category = WorkCategory.REFACTOR;
+  }
   let complexity = Complexity.LOW;
-  if (fileCount === 0) complexity = Complexity.LOW;
-  else if (fileCount <= 2) complexity = Complexity.LOW;
-  else if (fileCount <= 6) complexity = Complexity.MEDIUM;
-  else complexity = Complexity.HIGH;
+  if (fileCount >= 7 || acc.toolCalls.length >= 30) complexity = Complexity.HIGH;
+  else if (fileCount >= 3 || acc.toolCalls.length >= 10) complexity = Complexity.MEDIUM;
   return { category, complexity };
 }
 function readSkillSummary(sessionId) {
@@ -708,24 +739,28 @@ function flushToBuffer(acc) {
 function buildSummary(acc, category) {
   const fileCount = acc.filesWritten.size;
   const commitCount = acc.commitShas.size;
+  const toolCount = acc.toolCalls.length;
+  const project = acc.projectName || "unknown project";
   const parts = [];
   if (category !== WorkCategory.OTHER) {
     parts.push(category.toLowerCase());
   }
   if (fileCount > 0) {
-    parts.push(
-      `${fileCount} file${fileCount !== 1 ? "s" : ""} modified`
-    );
+    parts.push(`${fileCount} file${fileCount !== 1 ? "s" : ""} modified`);
   }
   if (commitCount > 0) {
-    parts.push(
-      `${commitCount} commit${commitCount !== 1 ? "s" : ""}`
-    );
+    parts.push(`${commitCount} commit${commitCount !== 1 ? "s" : ""}`);
   }
-  if (acc.projectName) {
-    parts.push(`in ${acc.projectName}`);
+  if (fileCount === 0 && commitCount === 0) {
+    if (toolCount > 0) {
+      const uniqueTools = [...new Set(acc.toolCalls.map((t) => t.tool))];
+      parts.push(`${acc.turns} turn${acc.turns !== 1 ? "s" : ""}, ${toolCount} tool call${toolCount !== 1 ? "s" : ""} (${uniqueTools.slice(0, 3).join(", ")})`);
+    } else {
+      parts.push(`${acc.turns} turn${acc.turns !== 1 ? "s" : ""} Q&A`);
+    }
   }
-  return parts.length > 0 ? parts.join(", ") : `Claude Code session in ${acc.projectName || "unknown project"}`;
+  parts.push(`in ${project}`);
+  return parts.join(", ");
 }
 function makeLogger(sessionId) {
   ensureDirs();
@@ -786,13 +821,15 @@ async function hookStop() {
     };
     log("new session");
   }
+  acc.turns = 0;
+  acc.toolCalls = [];
   if (transcript_path) {
     acc = analyzeTranscript(transcript_path, acc);
   }
   acc.lastUpdatedAt = (/* @__PURE__ */ new Date()).toISOString();
   log(`turns=${acc.turns} files=${acc.filesWritten.size} commits=${acc.commitShas.size}`);
   writeSessionAccumulator(acc);
-  if (acc.filesWritten.size > 0 || acc.commitShas.size > 0 || acc.turns >= 3) {
+  if (acc.filesWritten.size > 0 || acc.commitShas.size > 0 || acc.turns >= 1) {
     flushToBuffer(acc);
     const config = readConfig();
     if (config?.apiKey) {
@@ -822,11 +859,12 @@ var CLAUDE_SETTINGS_PATH2 = path6.join(CLAUDE_DIR2, "settings.json");
 var CLAUDE_SKILLS_PATH2 = path6.join(CLAUDE_DIR2, "skills", "bs-summarize.md");
 var CLAUDE_MD_PATH2 = path6.join(CLAUDE_DIR2, "CLAUDE.md");
 var HOOK_MARKER2 = "_hook-stop";
-var CLAUDE_MD_MARKER2 = "<!-- basestream -->";
-var SKILL_PERMISSIONS = [
-  `Write(${os4.homedir()}/.basestream/sessions/**)`,
-  `Read(${os4.homedir()}/.basestream/sessions/**)`
+var BASESTREAM_DIR3 = path6.join(os4.homedir(), ".basestream");
+var REQUIRED_PERMISSIONS2 = [
+  `Write(${BASESTREAM_DIR3}/**)`,
+  `Read(${BASESTREAM_DIR3}/**)`
 ];
+var CLAUDE_MD_BLOCK_RE = /\n?<!-- basestream -->[\s\S]*?<!-- \/basestream -->\n?/;
 function removeClaudeCodeHook() {
   if (!fs6.existsSync(CLAUDE_SETTINGS_PATH2)) {
     warn("No Claude Code settings found \u2014 nothing to remove");
@@ -856,7 +894,7 @@ function removeClaudeCodeHook() {
   if (permissions && Array.isArray(permissions.allow)) {
     const before = permissions.allow.length;
     permissions.allow = permissions.allow.filter(
-      (rule) => !SKILL_PERMISSIONS.includes(rule)
+      (p) => !REQUIRED_PERMISSIONS2.includes(p)
     );
     if (permissions.allow.length !== before) {
       if (permissions.allow.length === 0) delete permissions.allow;
@@ -879,9 +917,9 @@ function removeSkill() {
 }
 function removeClaudeMdRule() {
   if (!fs6.existsSync(CLAUDE_MD_PATH2)) return;
-  const existing = fs6.readFileSync(CLAUDE_MD_PATH2, "utf-8");
-  if (!existing.includes(CLAUDE_MD_MARKER2)) return;
-  const updated = existing.replace(/\n\n<!-- basestream -->[\s\S]*?<!-- \/basestream -->\n?/, "").replace(/<!-- basestream -->[\s\S]*?<!-- \/basestream -->\n?/, "").trimEnd();
+  const content = fs6.readFileSync(CLAUDE_MD_PATH2, "utf-8");
+  if (!CLAUDE_MD_BLOCK_RE.test(content)) return;
+  const updated = content.replace(CLAUDE_MD_BLOCK_RE, "\n").trimEnd();
   fs6.writeFileSync(CLAUDE_MD_PATH2, updated ? updated + "\n" : "");
   check("Removed Basestream rules from ~/.claude/CLAUDE.md");
 }
@@ -925,7 +963,7 @@ async function main() {
     process.exit(0);
   }
   if (command === "--version" || command === "-v") {
-    console.log(true ? "0.2.6" : "dev");
+    console.log(true ? "0.2.7" : "dev");
     process.exit(0);
   }
   switch (command || "init") {

package/package.json

@@ -18,5 +18,5 @@
     "unlink:cli": "npm unlink -g @basestream/cli"
   },
   "type": "module",
-  "version": "0.2.6"
+  "version": "0.2.7"
 }