@sma1lboy/kobe 0.8.69 → 0.8.71

package/dist/cli/pty-host-node.mjs

@@ -18,7 +18,7 @@ function bunTerminalDriver(spawn) {
     });
     return {
       pid: proc.pid,
-      exited: proc.exited,
+      exited: proc.exited.then(() => ({ code: proc.exitCode ?? null, signal: proc.signalCode ?? null }), () => ({ code: null, signal: null })),
       write: (data) => proc.terminal?.write(data),
       resize: (cols, rows) => proc.terminal?.resize(cols, rows),
       close: () => proc.terminal?.close(),
@@ -42,7 +42,7 @@ async function nodePtyDriver(spawn) {
       settle = resolve;
     });
     child.onData((data) => request.onData(data));
-    child.onExit(({ exitCode }) => settle(exitCode));
+    child.onExit(({ exitCode }) => settle({ code: exitCode, signal: null }));
     return {
       pid: child.pid,
       exited,
@@ -57,7 +57,7 @@ async function nodePtyDriver(spawn) {
 // ../kobe-daemon/src/daemon/pty-server.ts
 import { mkdir, unlink, writeFile } from "node:fs/promises";
 import { createServer } from "node:net";
-import { dirname } from "node:path";
+import { dirname as dirname2 } from "node:path";
 import { StringDecoder as StringDecoder2 } from "node:string_decoder";
 
 // ../kobe-daemon/src/daemon/client-writer.ts
@@ -236,6 +236,9 @@ function defaultPtyHostPidPath(homeDir = process.env.KOBE_HOME_DIR ?? homedir())
     return override;
   return join(homeDir, ".kobe", "pty.pid");
 }
+function defaultPtyExitsPath(homeDir = process.env.KOBE_HOME_DIR ?? homedir()) {
+  return join(homeDir, ".kobe", "pty-exits.json");
+}
 // ../kobe-plugin-sdk/src/contract.ts
 var DAEMON_CHANNELS = [
   "task.snapshot",
@@ -269,6 +272,51 @@ function frameToLine(frame) {
 `;
 }
 
+// ../kobe-daemon/src/daemon/pty-exit-store.ts
+import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname } from "node:path";
+var MAX_RECORDS = 50;
+var TAIL_LINES = 40;
+var TAIL_LINE_CHARS = 500;
+var ANSI_RE = /\x1b\[[0-9;?]*[ -/]*[@-~]|\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)?|\x1b[@-_]/g;
+function plainTail(raw) {
+  const plain = raw.replace(ANSI_RE, "").replace(/\r\n/g, `
+`);
+  const lines = plain.split(`
+`).map((line) => (line.split("\r").pop() ?? "").slice(0, TAIL_LINE_CHARS));
+  while (lines.length > 0 && (lines[lines.length - 1] ?? "").trim() === "")
+    lines.pop();
+  return lines.slice(-TAIL_LINES);
+}
+function readPtyExitRecords(path = defaultPtyExitsPath()) {
+  try {
+    const parsed = JSON.parse(readFileSync(path, "utf8"));
+    if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed))
+      return {};
+    return parsed;
+  } catch {
+    return {};
+  }
+}
+function recordPtyExit(info, path = defaultPtyExitsPath()) {
+  if (info.key.startsWith("::"))
+    return;
+  if (info.exit.code === 0 && info.exit.signal === null)
+    return;
+  const records = readPtyExitRecords(path);
+  records[info.key] = {
+    key: info.key,
+    pid: info.pid,
+    code: info.exit.code,
+    signal: info.exit.signal,
+    at: info.exit.at,
+    tail: plainTail(info.tail)
+  };
+  const newest = Object.values(records).sort((a, b) => a.at < b.at ? 1 : -1).slice(0, MAX_RECORDS);
+  mkdirSync(dirname(path), { recursive: true });
+  writeFileSync(path, JSON.stringify(Object.fromEntries(newest.map((r) => [r.key, r])), null, 2), "utf8");
+}
+
 // ../kobe-daemon/src/daemon/pty-host.ts
 import { StringDecoder } from "node:string_decoder";
 
@@ -344,6 +392,24 @@ function embeddedTerminalEnv(base, overrides = {}) {
 }
 
 // ../kobe-daemon/src/daemon/pty-observability.ts
+function describeExit(exit) {
+  if (exit?.signal)
+    return ` (signal ${exit.signal})`;
+  if (exit && exit.code !== null)
+    return ` (code ${exit.code})`;
+  return " (cause unknown)";
+}
+function ringTail(chunks, bytes, maxBytes) {
+  const skip = Math.max(0, bytes - maxBytes);
+  let seen = 0;
+  const parts = [];
+  for (const chunk of chunks) {
+    if (seen + chunk.byteLength > skip)
+      parts.push(seen >= skip ? chunk : chunk.subarray(skip - seen));
+    seen += chunk.byteLength;
+  }
+  return Buffer.concat(parts).toString("utf8");
+}
 var OSC_TITLE_RE = /\x1b\][02];([^\x07\x1b]*)(?:\x07|\x1b\\)/g;
 var TITLE_CARRY_CAP = 1024;
 function titleCarryFrom(rest) {
@@ -370,8 +436,9 @@ function scanOscTitle(session, buf) {
   session.titleCarry = carry;
 }
 function peekRing(session, sinceOffset) {
-  if (!session)
-    return { exists: false, alive: false, pid: null, offset: 0, data: "", sinceValid: false };
+  if (!session) {
+    return { exists: false, alive: false, pid: null, offset: 0, data: "", sinceValid: false, exit: null };
+  }
   const windowStart = session.totalBytes - session.bytes;
   let buf = Buffer.concat(session.chunks);
   let sinceValid = false;
@@ -385,7 +452,8 @@ function peekRing(session, sinceOffset) {
     pid: session.proc?.pid ?? null,
     offset: session.totalBytes,
     data: buf.toString("base64"),
-    sinceValid
+    sinceValid,
+    exit: session.exit ?? null
   };
 }
 
@@ -417,6 +485,7 @@ function signalProcessGroup(pid, signal, fallback, platform = process.platform)
 // ../kobe-daemon/src/daemon/pty-host.ts
 var DEFAULT_SCROLLBACK_CAP = 512 * 1024;
 var TERMINATION_GRACE_MS = 500;
+var EXIT_TAIL_BYTES = 16 * 1024;
 
 class PtyHost {
   sessions = new Map;
@@ -434,7 +503,7 @@ class PtyHost {
       created = true;
       session = this.adoptSpare(key, spec) ?? this.spawn(key, spec);
       this.sessions.set(key, session);
-    } else if (session.alive && (session.cols !== spec.cols || session.rows !== spec.rows)) {
+    } else if (session.alive && spec.cols !== undefined && spec.rows !== undefined && (session.cols !== spec.cols || session.rows !== spec.rows)) {
       this.resize(key, spec.cols, spec.rows);
     }
     session.sinks.set(token, sink);
@@ -482,11 +551,13 @@ class PtyHost {
       return null;
     this.spare = null;
     spare.key = key;
-    if (spare.cols !== spec.cols || spare.rows !== spec.rows) {
-      spare.cols = spec.cols;
-      spare.rows = spec.rows;
+    const cols = spec.cols ?? spare.cols;
+    const rows = spec.rows ?? spare.rows;
+    if (spare.cols !== cols || spare.rows !== rows) {
+      spare.cols = cols;
+      spare.rows = rows;
       try {
-        spare.proc?.resize(spec.cols, spec.rows);
+        spare.proc?.resize(cols, rows);
       } catch {
         this.markExited(spare);
         return null;
@@ -494,7 +565,7 @@ class PtyHost {
     }
     this.opts.log?.("pty", `adopted warm shell for ${key} (pid ${spare.proc?.pid})`);
     this.opts.onSessionStart?.();
-    this.warm(spec.cwd, spare.command[0], spec.cols, spec.rows);
+    this.warm(spec.cwd, spare.command[0], cols, rows);
     return spare;
   }
   write(key, data) {
@@ -548,8 +619,10 @@ class PtyHost {
       pid: s.proc?.pid ?? null,
       command: s.command,
       title: s.title,
+      totalBytes: s.totalBytes,
       parked: s.parked,
-      parkedScreenBytes: s.parkedScreenBytes
+      parkedScreenBytes: s.parkedScreenBytes,
+      exit: s.exit
     }));
   }
   peek(key, sinceOffset) {
@@ -599,6 +672,8 @@ class PtyHost {
   }
   spawn(key, spec, spare = false) {
     const argv = spec.command && spec.command.length > 0 ? [...spec.command] : [spec.shell ?? resolveLoginShell()];
+    const cols = spec.cols ?? 80;
+    const rows = spec.rows ?? 24;
     const session = {
       key,
       cwd: spec.cwd,
@@ -607,15 +682,16 @@ class PtyHost {
       chunks: [],
       bytes: 0,
       totalBytes: 0,
-      cols: spec.cols,
-      rows: spec.rows,
+      cols,
+      rows,
       command: argv,
       title: "",
       titleCarry: "",
       titleDecoder: new StringDecoder("utf8"),
       sinks: new Map,
       parked: false,
-      parkedScreenBytes: 0
+      parkedScreenBytes: 0,
+      exit: null
     };
     try {
       session.proc = (this.opts.driver ?? bunTerminalDriver())({
@@ -623,16 +699,16 @@ class PtyHost {
         cwd: spec.cwd,
         env: embeddedTerminalEnv(process.env, {
           TERM: "xterm-256color",
-          COLUMNS: String(spec.cols),
-          LINES: String(spec.rows),
+          COLUMNS: String(cols),
+          LINES: String(rows),
           BASH_SILENCE_DEPRECATION_WARNING: "1",
           KOBE_TERMINAL_PTY: "1"
         }),
-        cols: spec.cols,
-        rows: spec.rows,
+        cols,
+        rows,
         onData: (data) => this.onData(session, data)
       });
-      session.proc.exited.then(() => this.markExited(session), () => this.markExited(session));
+      session.proc.exited.then((exit) => this.markExited(session, exit), () => this.markExited(session));
       this.opts.log?.("pty", `spawned ${argv[0]} for ${key} (pid ${session.proc.pid})`);
       if (!spare)
         this.opts.onSessionStart?.();
@@ -663,21 +739,30 @@ class PtyHost {
     for (const sink of session.sinks.values())
       sink(frame);
   }
-  markExited(session) {
+  markExited(session, exit) {
     if (!session.alive)
       return;
     session.alive = false;
+    session.exit = { code: exit?.code ?? null, signal: exit?.signal ?? null, at: new Date().toISOString() };
     try {
       session.proc?.close();
     } catch {}
     const frame = {
       type: "event",
       name: "pty.exit",
-      payload: { key: session.key, pid: session.proc?.pid ?? null }
+      payload: { key: session.key, pid: session.proc?.pid ?? null, ...session.exit }
     };
     for (const sink of session.sinks.values())
       sink(frame);
-    this.opts.log?.("pty", `session ${session.key} exited`);
+    this.opts.log?.("pty", `session ${session.key} exited${describeExit(session.exit)}`);
+    try {
+      this.opts.onSessionExit?.({
+        key: session.key,
+        pid: session.proc?.pid ?? null,
+        exit: session.exit,
+        tail: ringTail(session.chunks, session.bytes, EXIT_TAIL_BYTES)
+      });
+    } catch {}
     this.opts.onSessionEnd?.();
   }
   async endChild(session) {
@@ -736,13 +821,20 @@ async function startPtyHostServer(options = {}) {
       if (ptys.liveCount() === 0)
         armIdle();
     },
+    onSessionExit: (info) => {
+      try {
+        recordPtyExit(info);
+      } catch (err) {
+        log("pty", `exit record write failed for ${info.key}: ${err instanceof Error ? err.message : String(err)}`);
+      }
+    },
     driver: options.driver,
     log
   });
   const pipeSocket = isWindowsPipePath(socketPath);
   if (!pipeSocket)
-    await mkdir(dirname(socketPath), { recursive: true });
-  await mkdir(dirname(pidPath), { recursive: true });
+    await mkdir(dirname2(socketPath), { recursive: true });
+  await mkdir(dirname2(pidPath), { recursive: true });
   const server = createServer((socket) => {
     const client = {
       socket,
@@ -797,8 +889,8 @@ async function startPtyHostServer(options = {}) {
           cwd: requireString(payload, "cwd"),
           command: Array.isArray(payload.command) ? payload.command.filter((c) => typeof c === "string") : undefined,
           shell: typeof payload.shell === "string" ? payload.shell : undefined,
-          cols: typeof payload.cols === "number" ? payload.cols : 80,
-          rows: typeof payload.rows === "number" ? payload.rows : 24
+          cols: typeof payload.cols === "number" ? payload.cols : undefined,
+          rows: typeof payload.rows === "number" ? payload.rows : undefined
         }, client, (frame) => writeFrame(client, frame), typeof payload.sinceOffset === "number" ? payload.sinceOffset : undefined, typeof payload.sincePid === "number" ? payload.sincePid : undefined);
       }
       case "pty.write": {

package/dist/skills/kobe/SKILL.md

@@ -3,7 +3,7 @@ name: kobe
 description: Use when controlling kobe tasks, parallel coding attempts, hosted agent sessions, task lifecycle, or the daemon-owned issue tracker from a shell.
 ---
 
-<!-- kobe-skill-version: 13 — bump in lockstep with KOBE_SKILL_VERSION (src/lib/skill-install.ts). -->
+<!-- kobe-skill-version: 14 — bump in lockstep with KOBE_SKILL_VERSION (src/lib/skill-install.ts). -->
 
 # kobe shell control
 
@@ -140,7 +140,7 @@ logs, dashboards), don't scatter panes for work `add`/`fan-out` should own.
 | `pin --task-id ID [--pinned=false]` | Pin/unpin |
 | `set-active --task-id ID` / `--none` | Change shared active task |
 | `ensure-worktree --task-id ID` | Materialize without starting an engine |
-| `land --task-id ID [--strategy merge\|squash] [--delete-branch] [--then-archive]` | Merge the task's branch into the base repo's current branch |
+| `land --task-id ID [--strategy merge\|squash] [--delete-branch] [--then-archive] [--remove-worktree]` | Merge the task's branch into the base repo's current branch; `--remove-worktree` cleans up the Worktree after (branch stays; dirty/self/base refused, outcome in the result's `worktree` field) |
 | `delete --task-id ID [--force]` | Destructive task + Worktree removal |
 | `discover-adoptable --repo PATH` | Find untracked Worktrees |
 | `adopt --repo PATH --worktree PATH` | Import a Worktree |

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@sma1lboy/kobe",
-  "version": "0.8.69",
+  "version": "0.8.71",
   "description": "TUI orchestrator for Claude Code (codename)",
   "type": "module",
   "packageManager": "bun@1.3.13",