himotoku 0.1.1 → 0.1.3

package/bin/himotoku.mjs

@@ -3,7 +3,7 @@
 // src/cli.ts
 import { Command } from "commander";
 import path2 from "node:path";
-import { existsSync as existsSync2, readdirSync } from "node:fs";
+import { existsSync as existsSync2, readFileSync, statSync } from "node:fs";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // packages/server/dist/index.js
@@ -35,9 +35,7 @@ Respond in the user's language (detect from their message).`;
     options: {
       systemPrompt,
       cwd,
-      allowedTools: ["Read", "Grep", "Glob", "Bash"],
-      permissionMode: "bypassPermissions",
-      allowDangerouslySkipPermissions: true,
+      allowedTools: ["Read", "Grep", "Glob"],
       includePartialMessages: true,
       maxTurns: 25,
       abortController,
@@ -45,8 +43,9 @@ Respond in the user's language (detect from their message).`;
     }
   });
   let fullContent = "";
+  const toolNameMap = /* @__PURE__ */ new Map();
   for await (const message of q) {
-    for (const out of mapMessage(message, fullContent)) {
+    for (const out of mapMessage(message, toolNameMap)) {
       if (out.type === "chat_stream") {
         fullContent += out.content;
       }
@@ -54,7 +53,7 @@ Respond in the user's language (detect from their message).`;
     }
   }
 }
-function* mapMessage(message, _fullContent) {
+function* mapMessage(message, toolNameMap) {
   switch (message.type) {
     case "stream_event": {
       const event = message.event;
@@ -67,6 +66,7 @@ function* mapMessage(message, _fullContent) {
       for (const block of message.message.content) {
         if (typeof block === "object" && "type" in block) {
           if (block.type === "tool_use") {
+            toolNameMap.set(block.id, block.name);
             yield {
               type: "tool_start",
               tool: block.name,
@@ -84,12 +84,14 @@ function* mapMessage(message, _fullContent) {
         const blocks = Array.isArray(content) ? content : [];
         for (const block of blocks) {
           if (typeof block === "object" && "type" in block && block.type === "tool_result") {
+            const toolUseId = "tool_use_id" in block ? block.tool_use_id : "";
             const output = typeof block.content === "string" ? block.content : JSON.stringify(block.content);
             yield {
               type: "tool_result",
-              tool: "unknown",
+              // #3: Look up actual tool name
+              tool: toolNameMap.get(toolUseId) ?? "unknown",
               output: output.slice(0, 2e3),
-              toolUseId: "tool_use_id" in block ? block.tool_use_id : ""
+              toolUseId
             };
           }
         }
@@ -102,7 +104,9 @@ function* mapMessage(message, _fullContent) {
         yield {
           type: "chat_done",
           fullContent: success.result,
-          costUsd: success.total_cost_usd
+          costUsd: success.total_cost_usd,
+          // #4: Return session_id for conversation continuity
+          sessionId: success.session_id
         };
       } else {
         const error = message;
@@ -122,13 +126,15 @@ function createServer({ port, cwd, clientDistPath: clientDistOverride }) {
   const { injectWebSocket, upgradeWebSocket } = createNodeWebSocket({ app });
   app.get("/ws", upgradeWebSocket(() => {
     let abortController = null;
+    let isProcessing = false;
+    let sessionId;
     return {
       onMessage: async (event, ws) => {
         let data;
         try {
           data = JSON.parse(typeof event.data === "string" ? event.data : event.data.toString());
         } catch {
-          ws.send(JSON.stringify({ type: "error", message: "Invalid JSON" }));
+          safeSend(ws, { type: "error", message: "Invalid JSON" });
           return;
         }
         if (data.type === "cancel") {
@@ -136,41 +142,55 @@ function createServer({ port, cwd, clientDistPath: clientDistOverride }) {
           return;
         }
         if (data.type === "chat") {
+          if (isProcessing) {
+            safeSend(ws, {
+              type: "error",
+              message: "A request is already in progress. Please wait or cancel it first."
+            });
+            return;
+          }
+          isProcessing = true;
           abortController = new AbortController();
           try {
             for await (const msg of runAgent({
               prompt: data.content,
               cwd,
+              sessionId,
               abortController
             })) {
-              ws.send(JSON.stringify(msg));
+              if (msg.type === "chat_done" && msg.sessionId) {
+                sessionId = msg.sessionId;
+              }
+              safeSend(ws, msg);
             }
           } catch (err) {
             if (err.name !== "AbortError") {
-              ws.send(JSON.stringify({
+              safeSend(ws, {
                 type: "error",
                 message: String(err)
-              }));
+              });
             }
           } finally {
             abortController = null;
+            isProcessing = false;
           }
         }
       }
     };
   }));
-  const __dirname = path.dirname(fileURLToPath(import.meta.url));
-  const clientDistPath = clientDistOverride ?? path.resolve(__dirname, "../../client/dist");
+  const __dirname2 = path.dirname(fileURLToPath(import.meta.url));
+  const clientDistPath = clientDistOverride ?? path.resolve(__dirname2, "../../client/dist");
   if (existsSync(clientDistPath)) {
     app.use("/*", serveStatic({
-      root: path.relative(process.cwd(), clientDistPath)
+      root: clientDistPath,
+      rewriteRequestPath: (p) => p
     }));
     app.get("*", serveStatic({
-      root: path.relative(process.cwd(), clientDistPath),
+      root: clientDistPath,
       rewriteRequestPath: () => "/index.html"
     }));
   }
-  const server = serve({ fetch: app.fetch, port }, () => {
+  const server = serve({ fetch: app.fetch, port, hostname: "127.0.0.1" }, () => {
     console.log(`  \u{1F310} http://localhost:${port}`);
     console.log(`  Ready! Ask me anything about this codebase.
 `);
@@ -178,41 +198,41 @@ function createServer({ port, cwd, clientDistPath: clientDistOverride }) {
   injectWebSocket(server);
   return server;
 }
+function safeSend(ws, data) {
+  if (ws.readyState === void 0 || ws.readyState === 1) {
+    try {
+      ws.send(JSON.stringify(data));
+    } catch {
+    }
+  }
+}
 
 // src/cli.ts
+var __dirname = path2.dirname(fileURLToPath2(import.meta.url));
+var pkg = JSON.parse(
+  readFileSync(path2.resolve(__dirname, "../package.json"), "utf-8")
+);
 var program = new Command();
-program.name("himotoku").version("0.1.0").description("Unravel any codebase \u2014 AI-powered code exploration via chat").argument("<repo-path>", "Path to the repository to analyze").option("-p, --port <number>", "Port to listen on", "4890").action((repoPath, opts) => {
+program.name("himotoku").version(pkg.version).description("Unravel any codebase \u2014 AI-powered code exploration via chat").argument("<repo-path>", "Path to the repository to analyze").option("-p, --port <number>", "Port to listen on", "4890").action((repoPath, opts) => {
   const cwd = path2.resolve(repoPath);
   if (!existsSync2(cwd)) {
     console.error(`Error: ${cwd} does not exist`);
     process.exit(1);
   }
-  const fileCount = countFiles(cwd);
+  if (!statSync(cwd).isDirectory()) {
+    console.error(`Error: ${cwd} is not a directory`);
+    process.exit(1);
+  }
   const port = parseInt(opts.port, 10);
+  if (isNaN(port) || port < 1 || port > 65535) {
+    console.error(`Error: Invalid port number "${opts.port}". Must be 1-65535.`);
+    process.exit(1);
+  }
   console.log();
-  console.log("\u{1F4DC} himotoku v0.1.0");
+  console.log(`\u{1F4DC} himotoku v${pkg.version}`);
   console.log(`  Analyzing: ${cwd}`);
-  console.log(`  ${fileCount} files found`);
   console.log();
-  const __dirname = path2.dirname(fileURLToPath2(import.meta.url));
   const clientDistPath = path2.resolve(__dirname, "../packages/client/dist");
   createServer({ port, cwd, clientDistPath });
 });
-function countFiles(dir, depth = 0) {
-  if (depth > 3) return 0;
-  try {
-    const entries = readdirSync(dir, { withFileTypes: true });
-    let count = 0;
-    for (const entry of entries) {
-      if (entry.name.startsWith(".") || entry.name === "node_modules") continue;
-      if (entry.isFile()) count++;
-      else if (entry.isDirectory()) {
-        count += countFiles(path2.join(dir, entry.name), depth + 1);
-      }
-    }
-    return count;
-  } catch {
-    return 0;
-  }
-}
 program.parse();

package/package.json

@@ -1,15 +1,18 @@
 {
   "name": "himotoku",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Unveil any codebase — AI-powered code exploration via chat",
   "type": "module",
   "workspaces": [
+    ".",
     "packages/*"
   ],
   "scripts": {
-    "build": "turbo build && node scripts/bundle.mjs",
-    "dev": "turbo dev",
-    "clean": "turbo clean"
+    "build": "node scripts/bundle.mjs",
+    "changeset": "changeset",
+    "version-packages": "changeset version",
+    "release": "changeset publish",
+    "prepublishOnly": "npx turbo build"
   },
   "bin": {
     "himotoku": "bin/himotoku.mjs"
@@ -28,6 +31,14 @@
     "claude",
     "agent"
   ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/gipcompany/himotoku.git"
+  },
+  "homepage": "https://github.com/gipcompany/himotoku",
+  "bugs": {
+    "url": "https://github.com/gipcompany/himotoku/issues"
+  },
   "packageManager": "npm@11.6.2",
   "license": "MIT",
   "dependencies": {
@@ -35,12 +46,14 @@
     "@hono/node-server": "^1.14.0",
     "@hono/node-ws": "^1.1.0",
     "commander": "^13.0.0",
-    "hono": "^4.7.0"
-  },
-  "peerDependencies": {
+    "hono": "^4.7.0",
     "zod": "^4.0.0"
   },
   "devDependencies": {
+    "@himotoku/core": "*",
+    "@himotoku/server": "*",
+    "@changesets/changelog-github": "^0.6.0",
+    "@changesets/cli": "^2.30.0",
     "@types/node": "^22.0.0",
     "esbuild": "^0.27.4",
     "turbo": "^2.5.0",