arkaos 2.65.0 → 2.67.0

package/VERSION

@@ -1 +1 @@
-2.65.0
+2.67.0

package/config/settings-template.json

@@ -4,6 +4,9 @@
     "command": "{{STATUSLINE_PATH}}",
     "padding": 2
   },
+  "worktree": {
+    "baseRef": "head"
+  },
   "hooks": {
     "SessionStart": [
       {

package/core/runtime/llm_cost_telemetry.py

@@ -66,9 +66,15 @@ def record_cost(
     tokens_out: int,
     cached_tokens: int,
     estimated_cost_usd: float | None,
+    category: str = "",
 ) -> None:
     """Append one JSONL line describing an LLM call's cost.
 
+    `category` mirrors Claude Code v2.1.149's per-category usage
+    breakdown: ``"skill:<slug>"``, ``"subagent:<dept>"``,
+    ``"plugin:<id>"``, ``"mcp:<server>"``, or ``""`` for base usage.
+    Free-form string — the aggregator groups whatever it sees.
+
     Silently swallows all errors. Telemetry must never break a
     completion call. The caller decides whether to compute the cost via
     `core.runtime.pricing.estimate_cost_usd` or pass None.
@@ -87,6 +93,7 @@ def record_cost(
                 if estimated_cost_usd is not None
                 else None
             ),
+            "category": str(category or ""),
         }
         with _locked_append(_telemetry_path()) as fh:
             fh.write(json.dumps(entry, ensure_ascii=False) + "\n")
@@ -133,6 +140,7 @@ class CostSummary:
     call_count: int
     by_provider: dict[str, dict[str, Any]] = field(default_factory=dict)
     by_model: dict[str, dict[str, Any]] = field(default_factory=dict)
+    by_category: dict[str, dict[str, Any]] = field(default_factory=dict)
     by_session: list[dict[str, Any]] = field(default_factory=list)
     advisories: list[str] = field(default_factory=list)
     corrupt_line_count: int = 0
@@ -291,6 +299,7 @@ def summarise(
         call_count=finalised["call_count"],
         by_provider=_group(entries, "provider"),
         by_model=_group(entries, "model"),
+        by_category=_group(entries, "category"),
         by_session=sessions,
         advisories=_build_advisories(sessions, advisory_threshold_usd),
         corrupt_line_count=corrupt,

package/core/runtime/llm_cost_telemetry_cli.py

@@ -89,6 +89,12 @@ def _render_sessions(rows: list[dict[str, Any]], title: str) -> list[str]:
     return lines
 
 
+def _has_category_data(group: dict[str, dict[str, Any]]) -> bool:
+    # The summariser always returns at least the "" bucket for legacy
+    # rows. Hide the section unless ≥ 1 row has a non-empty key.
+    return any(k.strip() for k in group.keys())
+
+
 def _render_advisories(advisories: list[str]) -> list[str]:
     if not advisories:
         return []
@@ -101,6 +107,11 @@ def _format_summary(summary: CostSummary) -> str:
     parts.append("")
     parts.extend(_render_group("By provider", summary.by_provider))
     parts.extend(_render_group("By model", summary.by_model))
+    # Per-category breakdown (Claude Code v2.1.149+): skill, subagent,
+    # plugin, mcp-server. Renders only when at least one categorised
+    # entry exists so old telemetry doesn't show an empty section.
+    if _has_category_data(summary.by_category):
+        parts.extend(_render_group("By category", summary.by_category))
     parts.extend(_render_sessions(summary.by_session, "Top 10 sessions"))
     parts.extend(_render_advisories(summary.advisories))
     if summary.corrupt_line_count:

package/installer/index.js

@@ -330,6 +330,21 @@ export async function install({ runtime, path, force, skipSystem, withOllama })
     console.log(`         Warning: could not seed autoMode.hard_deny (${err.message})`);
   }
 
+  // PR48 v2.67.0 — seed worktree.baseRef = "head" so new Claude Code
+  // worktrees branch from the current HEAD instead of the repo's main.
+  // Only sets when missing — operator overrides are preserved.
+  try {
+    const { seedWorktreeBaseRef } = await import("./worktree-baseref.js");
+    const wtResult = seedWorktreeBaseRef({ runtime });
+    if (!wtResult.skipped && wtResult.action === "created") {
+      console.log(`         worktree.baseRef set to "${wtResult.value}".`);
+    } else if (!wtResult.skipped && wtResult.action === "merged") {
+      console.log(`         worktree.baseRef merged ("${wtResult.value}").`);
+    }
+  } catch (err) {
+    console.log(`         Warning: could not seed worktree.baseRef (${err.message})`);
+  }
+
   // PR43 v2.62.0 — auto-install default Claude Code plugins. Only runs
   // when runtime is Claude Code AND the `claude` CLI is available.
   // Idempotent: skips plugins already in installed_plugins.json.

package/installer/worktree-baseref.js

@@ -0,0 +1,61 @@
+// worktree.baseRef default for Claude Code (PR48 v2.67.0).
+//
+// Claude Code v2.1.151+ added the `worktree.baseRef` setting which
+// controls where new worktrees branch from. The default is the repo's
+// main branch, but for ArkaOS's iterative feature-branch workflow we
+// want worktrees to branch from the current HEAD instead — that way an
+// agent working from a feature branch gets a worktree built on top of
+// the in-progress branch, not master.
+//
+// Behaviour:
+//   - No-op when runtime is not Claude Code.
+//   - Only sets the value when it's missing. Operator-authored values
+//     are preserved (this is a default, not a contract).
+//   - Atomic write via .tmp + rename.
+//   - Never raises — failures are non-fatal.
+
+import { existsSync, readFileSync, writeFileSync, renameSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+
+
+export const DEFAULT_WORKTREE_BASEREF = "head";
+
+
+export function seedWorktreeBaseRef({
+  runtime = "claude-code",
+  home = homedir(),
+  defaultValue = DEFAULT_WORKTREE_BASEREF,
+} = {}) {
+  if (runtime !== "claude-code") {
+    return { skipped: "runtime-not-claude-code", action: null };
+  }
+  const settingsPath = join(home, ".claude", "settings.json");
+  if (!existsSync(settingsPath)) {
+    return { skipped: "claude-settings-not-found", action: null };
+  }
+  let settings;
+  try {
+    settings = JSON.parse(readFileSync(settingsPath, "utf-8"));
+  } catch {
+    return { skipped: "settings-not-parseable", action: null };
+  }
+  if (typeof settings !== "object" || settings === null) {
+    return { skipped: "settings-not-object", action: null };
+  }
+  const existing = settings.worktree && typeof settings.worktree === "object"
+    ? settings.worktree
+    : null;
+  if (existing && typeof existing.baseRef === "string" && existing.baseRef) {
+    return { skipped: null, action: "noop", value: existing.baseRef };
+  }
+  settings.worktree = { ...(existing ?? {}), baseRef: defaultValue };
+  const tmp = `${settingsPath}.tmp-${process.pid}`;
+  writeFileSync(tmp, JSON.stringify(settings, null, 2) + "\n");
+  renameSync(tmp, settingsPath);
+  return {
+    skipped: null,
+    action: existing ? "merged" : "created",
+    value: defaultValue,
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arkaos",
-  "version": "2.65.0",
+  "version": "2.67.0",
   "description": "The Operating System for AI Agent Teams",
   "type": "module",
   "bin": {

package/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arkaos-core"
-version = "2.65.0"
+version = "2.67.0"
 description = "Core engine for ArkaOS — The Operating System for AI Agent Teams"
 readme = "README.md"
 license = {text = "MIT"}