@maxiaochao/pi-toolkit 0.10.6 → 0.10.8

package/packages/worktree/tests/extension.test.mjs

@@ -0,0 +1,114 @@
+import assert from "node:assert/strict";
+import { mkdtemp, mkdir, readFile, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import test from "node:test";
+
+const root = await mkdtemp(join(tmpdir(), "pi-worktree-extension-"));
+process.env.PI_CODING_AGENT_DIR = join(root, "agent");
+const { default: register, WORKTREE_SWITCH_REQUEST } = await import("../extensions/worktree.ts");
+
+test.after(async () => {
+  await rm(root, { recursive: true, force: true });
+});
+
+function setup(prepared) {
+  const commands = new Map();
+  const tools = new Map();
+  const pi = {
+    registerCommand(name, definition) { commands.set(name, definition); },
+    registerTool(definition) { tools.set(definition.name, definition); },
+    async exec(command, args, options) {
+      assert.match(command, /packages\/worktree\/bin\/pi-worktree$/);
+      assert.deepEqual(args, ["prepare", "--json", "--base", "main", "feature"]);
+      assert.equal(options.cwd, prepared.cwd);
+      return { code: 0, stdout: `${JSON.stringify(prepared.result)}\n`, stderr: "" };
+    },
+  };
+  register(pi);
+  return { commands, tools };
+}
+
+test("registers /worktree and switches a forked persistent session", async () => {
+  const cwd = join(root, "main");
+  const target = join(root, "main", ".worktrees", "feature");
+  await mkdir(target, { recursive: true });
+  const sourceSession = join(root, "source.jsonl");
+  await writeFile(sourceSession, `${JSON.stringify({ type: "session", version: 3, id: "source", timestamp: new Date().toISOString(), cwd })}\n`);
+  const prepared = { cwd, result: { status: "created", path: target, branch: "feature", dirty: false } };
+  const { commands } = setup(prepared);
+  const notifications = [];
+  let switchedFile;
+  await commands.get("worktree").handler("start feature --base main", {
+    cwd,
+    sessionManager: { getSessionFile: () => sourceSession },
+    waitForIdle: async () => {},
+    ui: { notify: (...args) => notifications.push(args) },
+    async switchSession(file, options) {
+      switchedFile = file;
+      await options.withSession({ ui: { notify: (...args) => notifications.push(args) } });
+      return { cancelled: false };
+    },
+  });
+
+  const header = JSON.parse((await readFile(switchedFile, "utf8")).split("\n")[0]);
+  assert.equal(header.cwd, target);
+  assert.equal(header.parentSession, sourceSession);
+  assert.deepEqual(notifications.at(-1), [`已切换到 feature：${target}`, "success"]);
+});
+
+test("removes the forked session when /worktree switching is cancelled", async () => {
+  const cwd = join(root, "cancel-main");
+  const target = join(cwd, ".worktrees", "feature");
+  await mkdir(target, { recursive: true });
+  const sourceSession = join(root, "cancel-source.jsonl");
+  await writeFile(sourceSession, `${JSON.stringify({ type: "session", version: 3, id: "cancel-source", timestamp: new Date().toISOString(), cwd })}\n`);
+  const prepared = { cwd, result: { status: "created", path: target, branch: "feature", dirty: false } };
+  const { commands } = setup(prepared);
+  const notifications = [];
+  let forkedFile;
+  await commands.get("worktree").handler("start feature --base main", {
+    cwd,
+    sessionManager: { getSessionFile: () => sourceSession },
+    waitForIdle: async () => {},
+    ui: { notify: (...args) => notifications.push(args) },
+    async switchSession(file) {
+      forkedFile = file;
+      return { cancelled: true };
+    },
+  });
+
+  await assert.rejects(readFile(forkedFile, "utf8"), { code: "ENOENT" });
+  assert.deepEqual(notifications.at(-1), ["worktree 会话切换已取消", "warning"]);
+});
+
+test("registers enter_worktree with a durable Harness switch request", async () => {
+  const cwd = join(root, "main");
+  const target = join(cwd, ".worktrees", "feature");
+  const sourceSession = join(root, "tool-source.jsonl");
+  const prepared = { cwd, result: { status: "reused", path: target, branch: "feature", dirty: true } };
+  const { tools } = setup(prepared);
+  const tool = tools.get("enter_worktree");
+  assert.equal(tool.exposure, "model-only");
+  assert.ok(tool.outputSchema);
+  const result = await tool.execute(
+    "call-1",
+    { name: "feature", base: "main" },
+    new AbortController().signal,
+    undefined,
+    { cwd, sessionManager: { getSessionFile: () => sourceSession } },
+  );
+
+  assert.equal(result.terminate, true);
+  assert.deepEqual(result.details, {
+    kind: WORKTREE_SWITCH_REQUEST,
+    version: 1,
+    action: "fork-and-switch",
+    sessionFile: sourceSession,
+    status: "reused",
+    path: target,
+    branch: "feature",
+    dirty: true,
+  });
+  assert.deepEqual(result.structuredContent, result.details);
+});

package/packages/worktree/tests/run-tests.sh

@@ -42,5 +42,91 @@ grep -q 'status:   clean' "$ROOT/info.txt"
 grep -q 'branch:   feature' "$ROOT/info.txt"
 grep -q 'based on:' "$ROOT/info.txt"
 
+bash "$PACKAGE_DIR/bin/pi-worktree" prepare --json feature > "$ROOT/reused.json"
+node -e '
+  const fs = require("node:fs");
+  const value = JSON.parse(fs.readFileSync(process.argv[1], "utf8"));
+  if (value.status !== "reused" || value.branch !== "feature" || value.dirty !== false) process.exit(1);
+' "$ROOT/reused.json"
+
+bash "$PACKAGE_DIR/bin/pi-worktree" prepare --json prepared > "$ROOT/created.json"
+node -e '
+  const fs = require("node:fs");
+  const value = JSON.parse(fs.readFileSync(process.argv[1], "utf8"));
+  if (value.status !== "created" || value.branch !== "prepared" || !value.path.endsWith("/.worktrees/prepared")) process.exit(1);
+' "$ROOT/created.json"
+
+mkdir -p nested/path
+(cd nested/path && bash "$PACKAGE_DIR/bin/pi-worktree" prepare --json from-subdir) > "$ROOT/subdir.json"
+node -e '
+  const fs = require("node:fs");
+  const value = JSON.parse(fs.readFileSync(process.argv[1], "utf8"));
+  if (value.path !== process.argv[2] + "/.worktrees/from-subdir") process.exit(1);
+' "$ROOT/subdir.json" "$ROOT/repo"
+
+git branch attachable
+bash "$PACKAGE_DIR/bin/pi-worktree" prepare --json attachable > "$ROOT/attached.json"
+node -e '
+  const fs = require("node:fs");
+  const value = JSON.parse(fs.readFileSync(process.argv[1], "utf8"));
+  if (value.status !== "attached" || value.branch !== "attachable") process.exit(1);
+' "$ROOT/attached.json"
+
+bash "$PACKAGE_DIR/bin/pi-worktree" prepare --json stale > /dev/null
+rm -rf .worktrees/stale
+if bash "$PACKAGE_DIR/bin/pi-worktree" prepare --json stale >/dev/null 2>&1; then
+  echo "prepare silently replaced a stale worktree registration" >&2
+  exit 1
+fi
+git worktree prune
+
+git worktree add .worktrees/wrong -b another-branch >/dev/null
+if bash "$PACKAGE_DIR/bin/pi-worktree" prepare --json wrong >/dev/null 2>&1; then
+  echo "prepare reused a path checked out on the wrong branch" >&2
+  exit 1
+fi
+
+mkdir .worktrees/main
+if bash "$PACKAGE_DIR/bin/pi-worktree" prepare --json main >/dev/null 2>&1; then
+  echo "prepare reused an ordinary directory as a worktree"
+  exit 1
+fi
+
+printf 'changed\n' >> .worktrees/prepared/tracked.txt
+bash "$PACKAGE_DIR/bin/pi-worktree" prepare --json prepared > "$ROOT/dirty.json"
+node -e '
+  const fs = require("node:fs");
+  const value = JSON.parse(fs.readFileSync(process.argv[1], "utf8"));
+  if (value.status !== "reused" || value.dirty !== true) process.exit(1);
+' "$ROOT/dirty.json"
+
+(cd .worktrees/prepared && bash "$PACKAGE_DIR/bin/pi-worktree" prepare --json prepared) > "$ROOT/active.json"
+node -e '
+  const fs = require("node:fs");
+  const value = JSON.parse(fs.readFileSync(process.argv[1], "utf8"));
+  if (value.status !== "already-active" || value.dirty !== true) process.exit(1);
+' "$ROOT/active.json"
+
+if bash "$PACKAGE_DIR/bin/pi-worktree" prepare --json ../escape >/dev/null 2>&1; then
+  echo "prepare accepted an unsafe worktree name" >&2
+  exit 1
+fi
+
+mkdir "$ROOT/symlink-repo" "$ROOT/outside-worktrees"
+(
+  cd "$ROOT/symlink-repo"
+  git init -q -b main
+  git config user.email test@example.com
+  git config user.name Test
+  printf 'base\n' > tracked.txt
+  git add tracked.txt
+  git commit -qm initial
+  ln -s "$ROOT/outside-worktrees" .worktrees
+  if bash "$PACKAGE_DIR/bin/pi-worktree" prepare --json escaped >/dev/null 2>&1; then
+    echo "prepare followed a symlinked .worktrees directory" >&2
+    exit 1
+  fi
+)
+
 bash "$PACKAGE_DIR/bin/pi-worktree" --help | grep -q 'pi-worktree start'
 printf 'PASS worktree CLI integration cases\n'