claudish 9.0.7 → 9.0.8

package/dist/index.js

@@ -715,7 +715,7 @@ var init_onepassword_config = __esm(() => {
 });
 
 // src/version.ts
-var VERSION = "9.0.7";
+var VERSION = "9.0.8";
 
 // src/logger.ts
 import { appendFile, existsSync as existsSync2, mkdirSync, readdirSync, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
@@ -19334,6 +19334,60 @@ var init_transform = __esm(() => {
 });
 
 // src/handlers/shared/format/openai-tools.ts
+function isPortablePattern(pattern) {
+  for (let i = 0;i < pattern.length; i++) {
+    const char = pattern[i];
+    if (char === "\\") {
+      const escaped = pattern[i + 1];
+      i++;
+      if (escaped && /[A-Za-z]/.test(escaped) && !PORTABLE_ESCAPE_LETTERS.has(escaped)) {
+        return false;
+      }
+      continue;
+    }
+    if (char === "(" && pattern[i + 1] === "?" && pattern[i + 2] === "<") {
+      const after = pattern[i + 3];
+      if (after !== "=" && after !== "!")
+        return false;
+    }
+  }
+  return true;
+}
+function isNamedSchemaMap(key, value) {
+  return NAMED_SCHEMA_MAPS.has(key) && !!value && typeof value === "object" && !Array.isArray(value);
+}
+function stripInNamedSchemaMap(map, path) {
+  const result = {};
+  for (const name in map) {
+    result[name] = stripUnportablePatterns(map[name], `${path}.${name}`);
+  }
+  return result;
+}
+function stripUnportablePatterns(schema, path = "parameters") {
+  if (Array.isArray(schema)) {
+    return schema.map((item, index) => stripUnportablePatterns(item, `${path}[${index}]`));
+  }
+  if (!schema || typeof schema !== "object")
+    return schema;
+  const result = {};
+  for (const key in schema) {
+    const value = schema[key];
+    if (key === "pattern" && typeof value === "string") {
+      if (isPortablePattern(value)) {
+        result[key] = value;
+      } else {
+        log(`[OpenAITools] Dropped unportable pattern at ${path}: ${value}`);
+      }
+      continue;
+    }
+    if (isNamedSchemaMap(key, value)) {
+      result[key] = stripInNamedSchemaMap(value, path);
+      continue;
+    }
+    result[key] = stripUnportablePatterns(value, `${path}.${key}`);
+  }
+  return result;
+}
 function emptyParamsSchema() {
   return { type: "object", properties: {} };
 }
@@ -19358,7 +19412,7 @@ function sanitizeSchemaForOpenAI(schema) {
   root.type = "object";
   if (!root.properties)
     root.properties = {};
-  return removeUriFormat(root);
+  return stripUnportablePatterns(removeUriFormat(root));
 }
 function convertToolsToOpenAI(req, summarize = false) {
   return req.tools?.map((tool) => ({
@@ -19398,8 +19452,33 @@ function summarizeToolParameters(schema) {
   }
   return summarized;
 }
+var PORTABLE_ESCAPE_LETTERS, NAMED_SCHEMA_MAPS;
 var init_openai_tools = __esm(() => {
+  init_logger();
   init_transform();
+  PORTABLE_ESCAPE_LETTERS = new Set([
+    "A",
+    "b",
+    "B",
+    "d",
+    "D",
+    "s",
+    "S",
+    "w",
+    "W",
+    "Z",
+    "a",
+    "f",
+    "n",
+    "r",
+    "t",
+    "v",
+    "x",
+    "u",
+    "U",
+    "N"
+  ]);
+  NAMED_SCHEMA_MAPS = new Set(["properties", "$defs", "definitions"]);
 });
 
 // src/adapters/base-api-format.ts
@@ -35872,7 +35951,7 @@ var init_provider_profiles = __esm(() => {
   };
   openaiProfile = {
     createHandler(ctx) {
-      if (requiresResponsesApi(ctx.modelName)) {
+      if (requiresResponsesApi(ctx.modelName, ctx.catalogCachePath)) {
         const responsesProvider = { ...ctx.provider, apiPath: "/v1/responses" };
         const transport = new OpenAIProviderTransport(responsesProvider, ctx.modelName, ctx.apiKey);
         const adapter = new CodexAPIFormat(ctx.modelName);
@@ -39733,6 +39812,7 @@ function sessionsIn(dirName) {
         id: basename(n, ".jsonl"),
         file,
         mtimeMs: st.mtimeMs,
+        birthtimeMs: st.birthtimeMs,
         sizeBytes: st.size
       };
       const head = readChunk(file, 0, Math.min(ENTRYPOINT_BYTES, st.size));
@@ -40076,10 +40156,12 @@ function sessionLabel(row) {
   return row.title || row.firstPrompt || row.id;
 }
 function findLatestSessionId(cwd = process.cwd(), sinceMs = 0) {
-  const rows = sessionsIn(slugForPath(cwd)).filter((r) => r.mtimeMs >= sinceMs);
-  if (rows.length === 0)
+  const touched = sessionsIn(slugForPath(cwd)).filter((r) => r.mtimeMs >= sinceMs);
+  if (touched.length === 0)
     return null;
-  return rows.reduce((a, b) => b.mtimeMs > a.mtimeMs ? b : a).id;
+  const born = touched.filter((r) => r.birthtimeMs !== undefined && r.birthtimeMs >= sinceMs);
+  const pool = born.length > 0 ? born : touched;
+  return pool.reduce((a, b) => b.mtimeMs > a.mtimeMs ? b : a).id;
 }
 var ENTRYPOINT_BYTES = 8192, PROJECTS_DIR, ACTIVE_WINDOW_MS = 120000, HEAD_BYTES, TAIL_BYTES, HARNESS_ENVELOPES, DEEP_TAIL_BYTES, RECENT_AI_TURNS = 5, RECENT_USER_TURNS = 1;
 var init_session_discovery = __esm(() => {
@@ -44619,7 +44701,7 @@ If you cannot use structured tool_calls, format as JSON:
 // src/adapters/openrouter-api-format.ts
 var OpenRouterAPIFormat;
 var init_openrouter_api_format = __esm(() => {
-  init_transform();
+  init_openai_tools();
   init_base_api_format();
   init_dialect_manager();
   OpenRouterAPIFormat = class OpenRouterAPIFormat extends BaseAPIFormat {
@@ -44673,14 +44755,7 @@ ${text}`;
       }
     }
     convertTools(claudeRequest, _summarize = false) {
-      return claudeRequest.tools?.map((tool) => ({
-        type: "function",
-        function: {
-          name: tool.name,
-          description: tool.description,
-          parameters: removeUriFormat(tool.input_schema)
-        }
-      })) || [];
+      return convertToolsToOpenAI(claudeRequest, false);
     }
     buildPayload(claudeRequest, messages, tools) {
       const payload = {
@@ -53590,8 +53665,12 @@ function retintSurfaces(palette, pageHex) {
     ]);
   }
 }
+function isLightTheme() {
+  return appliedMode === "light";
+}
 function applyTuiTheme(mode) {
   const palette = mode === "light" ? LIGHT2 : DARK;
+  appliedMode = mode;
   activeLatencyBuckets = mode === "light" ? LATENCY_BUCKETS_LIGHT : LATENCY_BUCKETS_DARK;
   Object.assign(C, palette);
   const terminalBg = getTerminalBackground();
@@ -53675,7 +53754,7 @@ function tokBarCells(tokensPerSec, maxTokPerSec, tokWidth) {
   const raw = Math.round(tokWidth * Math.max(0, tokensPerSec) / denom);
   return Math.min(tokWidth, Math.max(0, raw));
 }
-var DARK, LIGHT2, C, bold3, A, LATENCY_BUCKETS_DARK, LATENCY_BUCKETS_LIGHT, activeLatencyBuckets, latencyFg = "#ffffff", LATENCY_FG_ANSI = "\x1B[38;2;255;255;255m", ANSI_RESET = "\x1B[0m", STAGE_BG_DARK, STAGE_BG_LIGHT, STAGE_BG, STAGE_FG, STAGE_BG_ANSI, paletteRefreshers, SURFACE_TOKENS;
+var DARK, LIGHT2, C, bold3, A, LATENCY_BUCKETS_DARK, LATENCY_BUCKETS_LIGHT, activeLatencyBuckets, latencyFg = "#ffffff", LATENCY_FG_ANSI = "\x1B[38;2;255;255;255m", ANSI_RESET = "\x1B[0m", STAGE_BG_DARK, STAGE_BG_LIGHT, STAGE_BG, STAGE_FG, STAGE_BG_ANSI, paletteRefreshers, SURFACE_TOKENS, appliedMode = null;
 var init_theme2 = __esm(() => {
   init_theme_mode();
   DARK = {
@@ -66594,6 +66673,11 @@ function blendStops(steps, ...stops) {
     return mix(pts[s], pts[s + 1], p - s);
   });
 }
+function lighten(c, amount) {
+  const k = clamp01(amount);
+  const v = rgba(c);
+  return hex(RGBA.fromValues(v.r + (1 - v.r) * k, v.g + (1 - v.g) * k, v.b + (1 - v.b) * k, v.a));
+}
 function luminance(c) {
   const f = (v) => v <= 0.03928 ? v / 12.92 : ((v + 0.055) / 1.055) ** 2.4;
   return 0.2126 * f(clamp01(c.r)) + 0.7152 * f(clamp01(c.g)) + 0.0722 * f(clamp01(c.b));
@@ -68698,12 +68782,22 @@ function toolColors() {
 function toolOther() {
   return C.dim;
 }
+function area(hex) {
+  return isLightTheme() ? lighten(hex, 0.55) : hex;
+}
+function areaRamp(ramp) {
+  const [first, ...rest] = ramp;
+  return [area(first), ...rest.map(area)];
+}
 function cardWidth() {
   const cols = process.stdout.columns || 80;
   return Math.max(MIN_W, Math.min(MAX_W, cols - 2));
 }
+function shellArg(path) {
+  return /^[A-Za-z0-9_@%+=:,./-]+$/.test(path) ? path : `'${path.replace(/'/g, `'\\''`)}'`;
+}
 function renderSessionSummary(input) {
-  const { stats, modelSpec, resumeModelSpec, resumeId, exitCode } = input;
+  const { stats, modelSpec, resumeModelSpec, resumeId, resumeCwd, exitCode } = input;
   const W = cardWidth();
   const inner = W - CHROME;
   const out = [];
@@ -68732,22 +68826,24 @@ function renderSessionSummary(input) {
     row(dim(truncate3(stats.providerName, inner)));
   blank();
   const VALUE_W = 24;
-  const barW = Math.max(12, inner - LABEL_W - VALUE_W);
+  const BAR_MAX = 30;
+  const barW = Math.max(12, Math.min(BAR_MAX, inner - LABEL_W - VALUE_W));
+  const barGap = Math.max(0, inner - LABEL_W - barW - VALUE_W);
   const dataRow = (label, bar, values) => {
-    row(dim(padTo(label, LABEL_W)) + bar + padVisible2(values, VALUE_W, "right"));
+    row(dim(padTo(label, LABEL_W)) + bar + " ".repeat(barGap) + padVisible2(values, VALUE_W, "right"));
   };
   if (stats.contextUsed !== null && stats.contextWindow) {
     const pct = stats.contextUsed * 100;
-    dataRow("context", meter(pct, barW, ramps.load), body(padStartTo(`${Math.round(pct)}%`, 4)) + dim(`  ${compact(stats.inputTokens)}/${compact(stats.contextWindow)}`));
+    dataRow("context", meter(pct, barW, areaRamp(ramps.load)), body(padStartTo(`${Math.round(pct)}%`, 4)) + dim(`  ${compact(stats.inputTokens)}/${compact(stats.contextWindow)}`));
   }
   dataRow("tokens", stackedBar([
-    { value: stats.inputTokens, color: C.blue },
-    { value: stats.outputTokens, color: C.cyan }
+    { value: stats.inputTokens, color: area(C.blue) },
+    { value: stats.outputTokens, color: area(C.cyan) }
   ], barW), dim("in ") + body(compact(stats.inputTokens)) + dim(" out ") + body(compact(stats.outputTokens)));
   if (!stats.isFree && stats.inputCostUsd + stats.outputCostUsd > 0) {
     dataRow("spend", stackedBar([
-      { value: stats.inputCostUsd, color: C.blue },
-      { value: stats.outputCostUsd, color: C.cyan }
+      { value: stats.inputCostUsd, color: area(C.blue) },
+      { value: stats.outputCostUsd, color: area(C.cyan) }
     ], barW), dim("in ") + body(usd(stats.inputCostUsd)) + dim(" out ") + body(usd(stats.outputCostUsd)));
   }
   if (stats.toolCallTotal > 0) {
@@ -68755,9 +68851,12 @@ function renderSessionSummary(input) {
     const other = toolOther();
     const shown = stats.toolCalls.slice(0, toolCols.length);
     const rest = stats.toolCalls.slice(toolCols.length).reduce((a, t) => a + t.count, 0);
-    const segs = shown.map((t, i) => ({ value: t.count, color: toolCols[i] }));
+    const segs = shown.map((t, i) => ({
+      value: t.count,
+      color: area(toolCols[i])
+    }));
     if (rest > 0)
-      segs.push({ value: rest, color: other });
+      segs.push({ value: rest, color: area(other) });
     dataRow("tools", stackedBar(segs, barW), body(padStartTo(String(stats.toolCallTotal), 4)) + dim(" calls"));
     const legend = shown.map((t, i) => paint(`${t.name} ${t.count}`, toolCols[i])).concat(rest > 0 ? [paint(`other ${rest}`, other)] : []);
     for (const line of wrapStyled(legend, dim(" \xB7 "), inner - LABEL_W)) {
@@ -68765,14 +68864,16 @@ function renderSessionSummary(input) {
     }
   }
   blank();
-  row(dim(padTo("cost", LABEL_W)) + paint(stats.isFree ? "free" : usd(stats.costUsd), stats.isFree ? tokens.success : tokens.text, true) + (stats.isEstimated && !stats.isFree ? dim("  estimated") : ""));
+  row(dim(padTo("cost", LABEL_W)) + paint(stats.isFree ? "free" : usd(stats.costUsd), tokens.text, true) + (stats.isEstimated && !stats.isFree ? dim("  estimated") : ""));
+  const dearest = Math.max(0, ...stats.savings.map((s) => s.baselineUsd));
   for (const s of stats.savings) {
     const label = padTo(`vs ${s.label}`, LABEL_W);
     if (s.savedUsd >= 0) {
       const pct = s.baselineUsd > 0 ? s.savedUsd / s.baselineUsd * 100 : 0;
-      dataRow(label, meter(pct, barW, ramps.savings), paint(padStartTo(`${Math.round(pct)}%`, 4), tokens.success) + dim(" saved ") + paint(usd(s.savedUsd), tokens.success));
+      const share = dearest > 0 ? s.savedUsd / dearest * 100 : 0;
+      dataRow(label, meter(share, barW, areaRamp(ramps.volume)), dim(`${padStartTo(`${Math.round(pct)}%`, 4)} saved `) + body(usd(s.savedUsd)));
     } else {
-      dataRow(label, meter(0, barW, ramps.savings), dim("over by ") + paint(usd(-s.savedUsd), tokens.error));
+      dataRow(label, meter(0, barW, areaRamp(ramps.volume)), dim("over by ") + paint(usd(-s.savedUsd), tokens.error));
     }
   }
   out.push(paint(`\u2570${"\u2500".repeat(W - 2)}\u256F`, tokens.border));
@@ -68780,7 +68881,8 @@ function renderSessionSummary(input) {
     out.push("");
     out.push(dim("Resume this session with:"));
     const modelFlag = resumeModelSpec ? `--model ${resumeModelSpec} ` : "";
-    out.push(`claudish ${modelFlag}--resume ${resumeId}`);
+    const prefix = resumeCwd ? `cd ${shellArg(resumeCwd)} && ` : "";
+    out.push(`${prefix}claudish ${modelFlag}--resume ${resumeId}`);
   }
   return out;
 }
@@ -68812,6 +68914,7 @@ function printSessionSummary(input, write) {
 var MIN_W = 62, MAX_W = 96, CHROME = 4, LABEL_W = 10;
 var init_session_summary = __esm(() => {
   init_theme2();
+  init_color();
   init_text();
   init_tokens();
   init_ansi_viz();
@@ -69345,18 +69448,26 @@ Team Status`);
       write(`[claudish] Done
 `);
       try {
-        const [{ readSessionStats }, { printSessionSummary }, { findLatestSessionId }] = await Promise.all([
+        const [
+          { readSessionStats },
+          { printSessionSummary },
+          { findLatestSessionId, getRepoContext }
+        ] = await Promise.all([
           Promise.resolve().then(() => (init_session_stats(), exports_session_stats)),
           Promise.resolve().then(() => (init_session_summary(), exports_session_summary)),
           Promise.resolve().then(() => (init_session_discovery(), exports_session_discovery))
         ]);
         const stats = readSessionStats(port);
+        const repo = getRepoContext(process.cwd());
+        const worktreeCwd = repo && repo.current !== repo.root ? process.cwd() : null;
+        const runStartMs = Date.now() - Math.round(process.uptime() * 1000);
         if (stats) {
           printSessionSummary({
             stats,
             modelSpec: explicitModel || stats.modelName || "",
             resumeModelSpec: explicitModel ?? null,
-            resumeId: resumedSessionId ?? findLatestSessionId(process.cwd(), Date.now() - stats.durationMs),
+            resumeId: resumedSessionId ?? findLatestSessionId(process.cwd(), runStartMs),
+            resumeCwd: worktreeCwd,
             exitCode
           }, write);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudish",
-  "version": "9.0.7",
+  "version": "9.0.8",
   "description": "Run Claude Code with any model - OpenRouter, Ollama, LM Studio & local models",
   "type": "module",
   "main": "./dist/index.js",
@@ -60,10 +60,10 @@
     "ai"
   ],
   "optionalDependencies": {
-    "@claudish/magmux-darwin-arm64": "9.0.7",
-    "@claudish/magmux-darwin-x64": "9.0.7",
-    "@claudish/magmux-linux-arm64": "9.0.7",
-    "@claudish/magmux-linux-x64": "9.0.7"
+    "@claudish/magmux-darwin-arm64": "9.0.8",
+    "@claudish/magmux-darwin-x64": "9.0.8",
+    "@claudish/magmux-linux-arm64": "9.0.8",
+    "@claudish/magmux-linux-x64": "9.0.8"
   },
   "author": "Jack Rudenko <i@madappgang.com>",
   "license": "MIT",