@maudecode/talaria-web 1.18.0 → 1.20.0

package/dist/workspace/worktrees.js

@@ -1,24 +1,38 @@
 /** WebUI-managed Agent git worktrees (Python `api/worktrees.py`). */
-import { statSync } from 'node:fs';
-import { spawnGit } from './git.js';
+import { randomUUID } from 'node:crypto';
+import { lstatSync, readdirSync, readFileSync, readlinkSync, realpathSync, renameSync, statSync, symlinkSync, unlinkSync } from 'node:fs';
+import { basename, dirname, join, posix } from 'node:path';
+import { GitRunner, GitWorkspaceError, porcelainStatusEntries } from './git.js';
 import { resolvePathLikePython } from './paths.js';
 import { pyOsError } from '../util.js';
 /** The `OSError`/`TimeoutExpired` text Python interpolated into `Failed to remove worktree: {exc}`. */
 export class GitSpawnFailure extends Error {
 }
 async function git(args, cwd, timeoutMs = 2_000) {
-    const r = await spawnGit(cwd, args, timeoutMs);
-    if (r.error)
-        return null;
-    return { status: r.status ?? 1, stdout: r.stdout, stderr: r.stderr };
+    try {
+        return await gitOrThrow(args, cwd, timeoutMs);
+    }
+    catch (error) {
+        if (error instanceof GitSpawnFailure || (error instanceof GitWorkspaceError && error.code === 'not_a_repo'))
+            return null;
+        throw error;
+    }
 }
 async function gitOrThrow(args, cwd, timeoutMs) {
-    const r = await spawnGit(cwd, args, timeoutMs);
-    if (r.error) {
-        const code = r.error.code;
-        throw new GitSpawnFailure(code === 'ETIMEDOUT' ? `Command '${JSON.stringify(['git', ...args]).replaceAll('"', "'").replaceAll(',', ', ')}' timed out after ${String(timeoutMs / 1000)} seconds` : pyOsError(r.error, 'git'));
+    try {
+        const runner = new GitRunner({ env: process.env });
+        if (args[0] === 'status')
+            return await runner.worktreeStatus(cwd, timeoutMs);
+        if (args[0] === 'worktree' && args[1] === 'remove' && !args.includes('--force'))
+            return await runner.removeWorktree(cwd, args.at(-1) ?? '', timeoutMs);
+        return await runner.run(cwd, args, { timeoutMs });
+    }
+    catch (error) {
+        if (!(error instanceof GitWorkspaceError) || !(error.cause instanceof Error))
+            throw error;
+        const cause = error.cause;
+        throw new GitSpawnFailure(cause.code === 'ETIMEDOUT' ? `Command '${JSON.stringify(['git', ...args]).replaceAll('"', "'").replaceAll(',', ', ')}' timed out after ${String(timeoutMs / 1000)} seconds` : pyOsError(cause, 'git'));
     }
-    return { status: r.status ?? 1, stdout: r.stdout, stderr: r.stderr };
 }
 function resolvePath(path) {
     if (!path || typeof path !== 'string')
@@ -56,12 +70,110 @@ async function worktreeListed(worktreePath, repoRoot) {
         return false;
     return parseWorktreeListPorcelain(result.stdout).has(worktreePath);
 }
-async function statusPorcelain(worktreePath) {
-    const result = await git(['status', '--porcelain', '--untracked-files=normal'], worktreePath);
+/**
+ * Paths (git-status form) in the worktree that are the Agent's `.worktreeinclude` directory symlinks
+ * (`_include_symlink_paths`): a symlink at a listed entry that resolves to that same entry in the main checkout.
+ * A trailing-slash gitignore pattern never matches a symlink, so git reports each one as untracked.
+ */
+function includeSymlinkPaths(worktreePath, repoRoot) {
+    const paths = new Set();
+    if (!repoRoot)
+        return paths;
+    let text;
+    try {
+        text = readFileSync(join(repoRoot, '.worktreeinclude'), 'utf8').replace(/^\uFEFF/, '');
+    }
+    catch {
+        return paths;
+    }
+    for (const line of text.split(/\r\n|\r|\n/)) {
+        const trimmed = line.trim();
+        if (!trimmed || trimmed.startsWith('#'))
+            continue;
+        const entry = posix.normalize(trimmed).replace(/\/+$/, '');
+        if (isIncludeLink(worktreePath, repoRoot, entry))
+            paths.add(entry);
+    }
+    return paths;
+}
+function isIncludeLink(worktreePath, repoRoot, entry, at = join(worktreePath, entry)) {
+    try {
+        return lstatSync(at).isSymbolicLink() && realpathSync(at) === realpathSync(join(repoRoot, entry));
+    }
+    catch {
+        return false;
+    } // unreadable or dangling: real state, still counts
+}
+/**
+ * The include links an untracked git-status path covers, or null when it holds anything else. `--untracked-files=normal`
+ * reports a nested link (`vendor/node_modules`) as its untracked parent (`vendor`), so a parent qualifies when it is a
+ * real directory holding only include links and directories leading to them.
+ */
+function coveredIncludeLinks(worktreePath, path, include) {
+    if (include.has(path))
+        return [path];
+    if (![...include].some((e) => e.startsWith(`${path}/`)))
+        return null;
+    try {
+        if (!lstatSync(join(worktreePath, path)).isDirectory())
+            return null;
+        const links = [];
+        for (const child of readdirSync(join(worktreePath, path))) {
+            const covered = coveredIncludeLinks(worktreePath, `${path}/${child}`, include);
+            if (!covered)
+                return null;
+            links.push(...covered);
+        }
+        return links;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Unlink an include link without a check-then-delete gap: move it to a private name first, then verify what was moved.
+ * Anything else stays under that name and stops the removal.
+ */
+function unlinkIncludeLink(worktreePath, repoRoot, entry) {
+    const path = join(worktreePath, entry);
+    if (!isIncludeLink(worktreePath, repoRoot, entry))
+        return null; // replaced since the probe: git refuses it
+    const moved = join(dirname(path), `.${basename(path)}.talaria-remove-${randomUUID()}`);
+    try {
+        renameSync(path, moved);
+    }
+    catch {
+        return null;
+    } // already gone: git decides
+    if (!isIncludeLink(worktreePath, repoRoot, entry, moved))
+        throw new Error(`Worktree changed during removal; ${path} was moved to ${moved}.`);
+    const target = readlinkSync(moved);
+    unlinkSync(moved);
+    return { path, target };
+}
+/** `[dirty, untracked count, ignored include symlinks, gitlinks]`; the Agent's include links are not user state. */
+async function statusPorcelain(worktreePath, repoRoot) {
+    const result = await git(['status', '--porcelain', '-z', '--untracked-files=normal'], worktreePath);
     if (result?.status !== 0)
-        return [false, 0];
-    const lines = result.stdout.split('\n').filter(Boolean);
-    return [lines.length > 0, lines.filter((l) => l.startsWith('??')).length];
+        return [false, 0, [], false];
+    const entries = porcelainStatusEntries(result.stdout);
+    const counted = [];
+    const links = [];
+    let include;
+    for (const [entry] of entries) {
+        if (!entry)
+            continue;
+        if (entry.startsWith('?? ')) {
+            include ??= includeSymlinkPaths(worktreePath, repoRoot);
+            const covered = coveredIncludeLinks(worktreePath, entry.slice(3).replace(/\/+$/, ''), include);
+            if (covered) {
+                links.push(...covered);
+                continue;
+            }
+        }
+        counted.push(entry);
+    }
+    return [counted.length > 0, counted.filter((e) => e.startsWith('??')).length, links, 'hasGitlinks' in result && result.hasGitlinks];
 }
 async function aheadBehind(worktreePath) {
     const payload = { ahead: 0, behind: 0, available: false, upstream: null };
@@ -88,6 +200,9 @@ async function aheadBehind(worktreePath) {
     return payload;
 }
 export async function worktreeStatusForSession(session, locks) {
+    return (await probeWorktree(session, locks)).status;
+}
+async function probeWorktree(session, locks) {
     const worktreePath = resolvePath(session.worktree_path);
     if (!worktreePath)
         throw new Error('Session is not worktree-backed');
@@ -95,22 +210,23 @@ export async function worktreeStatusForSession(session, locks) {
     const lockedByStream = locks.lockedByStream(session);
     const lockedByTerminal = locks.lockedByTerminal(session.session_id, worktreePath);
     const listed = await worktreeListed(worktreePath, session.worktree_repo_root);
-    const [dirty, untracked] = exists ? await statusPorcelain(worktreePath) : [false, 0];
+    const [dirty, untracked, includeLinks, hasGitlinks] = exists ? await statusPorcelain(worktreePath, resolvePath(session.worktree_repo_root)) : [false, 0, [], false];
     const aheadBehindStatus = exists ? await aheadBehind(worktreePath) : { ahead: 0, behind: 0, available: false, upstream: null };
-    return {
+    const status = {
         path: worktreePath, exists, dirty, untracked_count: untracked, ahead_behind: aheadBehindStatus,
         locked_by_stream: lockedByStream, locked_by_terminal: lockedByTerminal, listed,
         // `removeWorktreeForSession`'s gates: a missing directory is always removable, a lock blocks removal outright,
-        // and uncommitted, untracked, or unpushed work needs `force`.
+        // and uncommitted, untracked, unpushed work or gitlinks need `force`.
         removable: !exists || !(lockedByStream || lockedByTerminal),
-        force_required: dirty || untracked > 0 || aheadBehindStatus.ahead > 0,
+        force_required: dirty || untracked > 0 || aheadBehindStatus.ahead > 0 || hasGitlinks,
     };
+    return { status, includeLinks };
 }
 export async function removeWorktreeForSession(session, locks, opts = {}) {
     const worktreePath = resolvePath(session.worktree_path);
     if (!worktreePath)
         throw new Error('Session is not worktree-backed');
-    const status = await worktreeStatusForSession(session, locks);
+    const { status, includeLinks } = await probeWorktree(session, locks);
     if (!status.exists)
         return { ok: true, removed_path: worktreePath, warnings: ['Worktree directory no longer exists on disk.'] };
     const warnings = [];
@@ -144,20 +260,42 @@ export async function removeWorktreeForSession(session, locks, opts = {}) {
     if (locks.lockedByTerminal(session.session_id, worktreePath))
         throw new Error('Worktree is locked by an active terminal session');
     await git(['worktree', 'unlock', worktreePath], repoRoot, 5_000);
-    const args = ['worktree', 'remove'];
-    if (force)
-        args.push('--force');
-    args.push(worktreePath);
-    let result;
+    // A plain `worktree remove` refuses any untracked entry; drop the Agent's include symlinks (never their targets)
+    // so git still guards everything else. Each is rechecked first: one replaced since the probe stays for git to refuse.
+    const resolvedRoot = resolvePath(repoRoot);
+    // A worktree that survives a failed removal gets them back.
+    const unlinked = [];
     try {
-        result = await gitOrThrow(args, repoRoot, 10_000);
+        if (!force && resolvedRoot) {
+            for (const link of includeLinks) {
+                const removed = unlinkIncludeLink(worktreePath, resolvedRoot, link);
+                if (removed)
+                    unlinked.push(removed);
+            }
+        }
+        const args = ['worktree', 'remove'];
+        if (force)
+            args.push('--force');
+        args.push(worktreePath);
+        let result;
+        try {
+            result = await gitOrThrow(args, repoRoot, 10_000);
+        }
+        catch (error) {
+            throw new Error(`Failed to remove worktree: ${error instanceof Error ? error.message : String(error)}`);
+        }
+        if (result.status !== 0) {
+            const stderr = result.stderr.trim().split('\n').pop() ?? '';
+            throw new Error(`git worktree remove failed: ${stderr || result.stdout.trim()}`);
+        }
     }
     catch (error) {
-        throw new Error(`Failed to remove worktree: ${error instanceof Error ? error.message : String(error)}`);
-    }
-    if (result.status !== 0) {
-        const stderr = result.stderr.trim().split('\n').pop() ?? '';
-        throw new Error(`git worktree remove failed: ${stderr || result.stdout.trim()}`);
+        for (const { path, target } of unlinked)
+            try {
+                symlinkSync(target, path);
+            }
+            catch { /* something else took its place */ }
+        throw error;
     }
     await git(['worktree', 'prune'], repoRoot, 5_000);
     return { ok: true, removed_path: worktreePath, warnings: warnings.length ? warnings : null };

package/dist/workspace/worktrees.js.map

@@ -1 +1 @@
-{"version":3,"file":"worktrees.js","sourceRoot":"","sources":["../../src/workspace/worktrees.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worktrees.js","sourceRoot":"","sources":["../../src/workspace/worktrees.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maudecode/talaria-web",
-  "version": "1.18.0",
+  "version": "1.20.0",
   "type": "module",
   "description": "Talaria Web server: Node 24 HTTP server for the Hermes Agent browser workbench, with the talaria-web launcher, daemon control, self-update, and MCP bins.",
   "bin": {
@@ -19,26 +19,28 @@
     "build": "tsc -p tsconfig.build.json",
     "typecheck": "tsc --noEmit -p tsconfig.json",
     "lint": "eslint .",
-    "pretest": "(test -f ../contracts/dist/index.js || npm --prefix ../contracts run build) && (test -f ../../static/dist/index.html || npm --prefix ../frontend run build:fast)",
+    "pretest": "(test -f ../contracts/dist/index.js || npm --prefix ../contracts run build) && (test -f ../../static/dist/index.html || npm --prefix ../frontend run build:fast) && npm run build",
     "test": "vitest run",
     "prepack": "node scripts/prepack.mjs",
     "postpack": "node scripts/prepack.mjs --clean"
   },
   "dependencies": {
-    "@maudecode/talaria-web-contracts": "1.18.0",
-    "@modelcontextprotocol/sdk": "1.30.0",
+    "@maudecode/talaria-web-contracts": "1.20.0",
+    "@modelcontextprotocol/sdk": "1.32.0",
     "@orpc/contract": "1.15.2",
     "@orpc/openapi": "1.15.2",
     "@orpc/server": "1.15.2",
     "mdast-util-from-markdown": "2.0.3",
     "node-pty": "1.1.0",
     "seek-bzip": "2.0.0",
+    "ws": "8.22.0",
     "xz-decompress": "0.2.3",
     "zod": "4.6.5"
   },
   "devDependencies": {
     "@types/mdast": "4.0.4",
     "@types/node": "24.13.6",
+    "@types/ws": "8.18.1",
     "eslint": "10.10.0",
     "typescript": "5.9.3",
     "typescript-eslint": "8.70.0",

package/sidecar/agent_dependency.json

@@ -1,12 +1,12 @@
 {
   "x-talaria": {
-    "releaseTag": "v0.21.6",
-    "version": "0.21.6",
-    "sourceRevision": "818c13be1dc4fd28987e1e881a9408224afd4535"
+    "releaseTag": "v0.22.4",
+    "version": "0.22.4",
+    "sourceRevision": "4d04303818b61bf3aa09278af48356315515965b"
   },
   "services": {
     "hermes-agent": {
-      "image": "docker.io/nousresearch/hermes-agent@sha256:9774f4f39a9bb8c2f68ce728ed5e99ddbad282163be56764afacf88ed952b784"
+      "image": "docker.io/nousresearch/hermes-agent@sha256:7a69201726bc64db2072a1371557137c23312d29705cda2b8ea2a0214a50a4cf"
     }
   }
 }

package/sidecar/agent_support.json

@@ -0,0 +1,29 @@
+{
+  "schemaVersion": 1,
+  "nativeContracts": {
+    "served-local-policy-v1": ["4d04303818b61bf3aa09278af48356315515965b"]
+  },
+  "releases": [
+    {
+      "releaseTag": "v0.22.2",
+      "version": "0.22.2",
+      "sourceRevision": "d923a5eb487a17c0a68801bba9ef0f56c81040a8",
+      "image": "docker.io/nousresearch/hermes-agent@sha256:36099926da316742423544e055d4734777105ffe6341873af5459b957d0c2919",
+      "validatedBy": "TAL-1061"
+    },
+    {
+      "releaseTag": "v0.22.3",
+      "version": "0.22.3",
+      "sourceRevision": "5b147ab036d6d19131bff8d20701b5001eab844a",
+      "image": "docker.io/nousresearch/hermes-agent@sha256:2f305c9bdc81731f48664586d23cb6a6f838a15ad7be1bfabe0c3c269d8e09b9",
+      "validatedBy": "TAL-1251"
+    },
+    {
+      "releaseTag": "v0.22.4",
+      "version": "0.22.4",
+      "sourceRevision": "4d04303818b61bf3aa09278af48356315515965b",
+      "image": "docker.io/nousresearch/hermes-agent@sha256:7a69201726bc64db2072a1371557137c23312d29705cda2b8ea2a0214a50a4cf",
+      "validatedBy": "TAL-1307"
+    }
+  ]
+}

package/sidecar/scripts/record-fixtures.py

@@ -20,6 +20,7 @@ sys.path.insert(0, str(HERE / "tests"))
 
 from conftest import AGENT_DIR, AGENT_PYTHON, SidecarProcess  # noqa: E402
 from talaria_sidecar import SIDECAR_RPC_VERSION  # noqa: E402
+from scenarios import UNEXERCISED  # noqa: E402
 from test_namespaces import run_scenarios  # noqa: E402
 
 TARGET = HERE.parent / "packages" / "contracts" / "fixtures" / "sidecar"
@@ -47,7 +48,7 @@ def main() -> int:
     fixtures: dict[str, dict[str, list]] = {}
     try:
         handshake = proc.result("runtime.handshake", {"rpc_version": SIDECAR_RPC_VERSION})
-        subs = [(str(root / "profiles" / "alpha"), "<profile>"), (str(root), "<home>"), (str(root.parent), "<user-home>"), (str(AGENT_DIR), "<agent>"), (AGENT_PYTHON, "<python>")]
+        subs = [(str(root / "profiles" / "alpha"), "<profile>"), (str(root), "<home>"), (str(root.parent), "<user-home>"), (AGENT_PYTHON, "<python>"), (str(AGENT_DIR), "<agent>")]
         fixtures.setdefault("runtime", {})["runtime.handshake"] = [{"params": {"rpc_version": SIDECAR_RPC_VERSION}, "result": normalize(handshake, subs)}]
         for method, params, message, frames in run_scenarios(proc, root):
             if "error" in message:
@@ -60,8 +61,16 @@ def main() -> int:
     finally:
         proc.close()
     TARGET.mkdir(parents=True, exist_ok=True)
-    for stale in TARGET.glob("*.json"):
-        stale.unlink()
+    stale = sorted(TARGET.glob("*.json"))
+    # Scenarios cannot reach unexercised methods, so their hand-written entries carry over.
+    # Read every file before deleting any, so a malformed one leaves the directory intact.
+    for previous in [json.loads(path.read_text(encoding="utf-8")) for path in stale]:
+        for method, entries in previous.items():
+            namespace = method.split(".", 1)[0]
+            if method in UNEXERCISED and method not in fixtures.get(namespace, {}):
+                fixtures.setdefault(namespace, {})[method] = entries
+    for path in stale:
+        path.unlink()
     for namespace, methods in sorted(fixtures.items()):
         (TARGET / f"{namespace}.json").write_text(json.dumps(methods, indent=2, ensure_ascii=False) + "\n", encoding="utf-8")
     print(f"record-fixtures: wrote {sum(len(v) for v in fixtures.values())} methods across {len(fixtures)} namespaces to {TARGET}")

package/sidecar/scripts/replay_sidecar.py

@@ -125,12 +125,18 @@ def _shutdown(ctx, params: dict) -> dict:
 def build_methods() -> dict:
     subs = _substitutions()
     methods = {}
+    spoken: dict[str, dict] = {}
     for path in sorted(FIXTURES.glob("*.json")):
         for method, entries in json.loads(path.read_text()).items():
             if entries:
                 methods[method] = _replay(_resolve(entries[0], subs))
+            if method == "text.spoken":
+                spoken = {entry["params"]["text"]: entry["result"] for entry in entries}
     handshake = methods["runtime.handshake"]
     methods["runtime.handshake"] = lambda ctx, params: {**handshake(ctx, params), "rpc_version": params.get("rpc_version", 1)}
+    # Selection fixtures apply only to their recorded target; ordinary replay model picks stay neutral.
+    selection = methods["models.selection_warnings"]
+    methods["models.selection_warnings"] = lambda ctx, params: selection(ctx, params) if params.get("model") == "muse-spark-1.2-contributor" else {"warnings": [], "context_tokens": params.get("context_tokens"), "provider": params.get("provider") or "", "base_url": ""}
     methods["chat.start"] = _chat_start
     methods["chat.interrupt"] = lambda ctx, params: {"ok": True, "reason": "replay"}
     methods["chat.steer"] = lambda ctx, params: {"accepted": True, "fallback": None}
@@ -141,6 +147,8 @@ def build_methods() -> dict:
     methods["approval.set_yolo"] = lambda ctx, params: {"yolo_enabled": bool(params.get("enabled")), "released": 0}
     # Every settled turn asks the goal judge (TAL-396); the replay holds no goal, so it answers as the sidecar does then.
     methods["goals.evaluate"] = lambda ctx, params: {"status": None, "should_continue": False, "continuation_prompt": None, "verdict": "inactive", "reason": "no active goal", "message": ""}
+    # TAL-906: a recorded text gets the Agent's recorded script; any other text is spoken as written.
+    methods["text.spoken"] = lambda ctx, params: spoken.get(str(params.get("text") or ""), {"spoken_text": str(params.get("text") or "")})
     methods["worktree.create"] = _worktree_create
     methods["runtime.shutdown"] = _shutdown
     return methods