clawspec 1.0.19 → 1.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clawspec",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "type": "module",
   "description": "OpenClaw plugin that orchestrates OpenSpec project workflows with visible main-agent execution.",
   "keywords": [
@@ -23,7 +23,6 @@
     "index.ts",
     "src",
     "skills",
-    "test",
     "README.md",
     "README.zh-CN.md",
     "openclaw.plugin.json",

package/src/watchers/manager.ts

@@ -2795,7 +2795,7 @@ function parseWorkerProgressEvent(line: string): WorkerProgressEvent | undefined
 
 function formatWorkerProgressMessage(project: ProjectState, event: WorkerProgressEvent): string | undefined {
   const rawMessage = typeof event.message === "string" ? event.message : "";
-  const message = shortenActivityText(rawMessage, 120);
+  const message = shortenActivityText(compactWorkerProgressDisplayPaths(project, rawMessage), 120);
   if (!message) {
     return undefined;
   }
@@ -2916,6 +2916,74 @@ function compactProjectLabel(project: ProjectState): string {
   return `${projectName}-${changeName}`;
 }
 
+function compactWorkerProgressDisplayPaths(project: ProjectState, text: string): string {
+  try {
+    const compactRoot = compactWorkerProgressRoot(project);
+    if (!compactRoot) {
+      return text;
+    }
+
+    let compacted = text;
+    if (project.changeDir) {
+      compacted = replaceDisplayPathPrefix(compacted, project.changeDir, `${compactRoot}:`);
+    }
+    if (project.repoPath) {
+      compacted = replaceDisplayPathPrefix(compacted, project.repoPath, `${compactRoot}:`);
+    }
+    compacted = normalizeCompactedDisplayPaths(compacted, compactRoot);
+    return compacted.length < text.length ? compacted : text;
+  } catch {
+    return text;
+  }
+}
+
+function compactWorkerProgressRoot(project: ProjectState): string | undefined {
+  const changeName = project.changeName?.trim();
+  if (!changeName) {
+    return undefined;
+  }
+  const projectName = project.projectName?.trim()
+    || (project.repoPath ? path.basename(project.repoPath) : undefined)
+    || "project";
+  return `${projectName}@${changeName}`;
+}
+
+function replaceDisplayPathPrefix(text: string, targetPath: string, replacement: string): string {
+  const pattern = buildDisplayPathPrefixPattern(targetPath);
+  if (!pattern) {
+    return text;
+  }
+  return text.replace(pattern, replacement);
+}
+
+function normalizeCompactedDisplayPaths(text: string, compactRoot: string): string {
+  const prefix = escapeRegExp(`${compactRoot}:`);
+  const pattern = new RegExp("(" + prefix + ")([^\\s\"'`,)\\]}]+)", "g");
+  return text.replace(pattern, (_match, prefix: string, suffix: string) => `${prefix}${suffix.replace(/\\/g, "/")}`);
+}
+
+function buildDisplayPathPrefixPattern(targetPath: string): RegExp | undefined {
+  const normalized = normalizeSlashes(targetPath).replace(/\/+$/, "");
+  if (!normalized) {
+    return undefined;
+  }
+
+  const escaped = normalized
+    .split("/")
+    .map((segment) => escapeRegExp(segment))
+    .join("[/\\\\]+");
+  if (!escaped) {
+    return undefined;
+  }
+
+  const flags = /^[A-Za-z]:/.test(normalized) ? "gi" : "g";
+  return new RegExp(`${escaped}(?:[/\\\\]+)?`, flags);
+}
+
+function escapeRegExp(value: string): string {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
 function compactProgressMarker(current?: number, total?: number): string {
   if (!total || total <= 0 || !current || current <= 0) {
     return "";

package/test/acp-client.test.ts

@@ -1,309 +0,0 @@
-import test from "node:test";
-import assert from "node:assert/strict";
-import os from "node:os";
-import path from "node:path";
-import { spawn } from "node:child_process";
-import { chmod, mkdtemp, writeFile } from "node:fs/promises";
-import { AcpWorkerClient } from "../src/acp/client.ts";
-import { terminateChildProcess } from "../src/utils/shell-command.ts";
-
-test("AcpWorkerClient tracks active worker lifecycle through acpx CLI", async () => {
-  const tempRoot = await mkdtemp(path.join(os.tmpdir(), "clawspec-acpx-client-"));
-  const fake = await createFakeAcpx(tempRoot);
-  const client = new AcpWorkerClient({
-    agentId: "codex",
-    logger: createLogger(),
-    command: fake.command,
-    env: fake.env,
-  });
-
-  const events: Array<{ type: string; text?: string }> = [];
-  const runPromise = client.runTurn({
-    sessionKey: "session-1",
-    cwd: tempRoot,
-    text: "fix tests",
-    onEvent: async (event) => {
-      events.push(event);
-    },
-  });
-
-  await waitFor(async () => {
-    const status = await client.getSessionStatus({
-      sessionKey: "session-1",
-      cwd: tempRoot,
-      agentId: "codex",
-    });
-    return status?.details?.status === "alive";
-  });
-
-  await runPromise;
-
-  const finalStatus = await client.getSessionStatus({
-    sessionKey: "session-1",
-    cwd: tempRoot,
-    agentId: "codex",
-  });
-
-  assert.equal(events.some((event) => event.type === "text_delta" && event.text?.includes("Working on fix tests")), true);
-  assert.match(finalStatus?.summary ?? "", /status=dead/);
-});
-
-test("AcpWorkerClient stops the worker when the gateway process disappears", async () => {
-  const tempRoot = await mkdtemp(path.join(os.tmpdir(), "clawspec-acpx-watchdog-"));
-  const fake = await createFakeAcpx(tempRoot);
-  const gateway = spawn(process.execPath, ["-e", "setInterval(() => {}, 1000)"], {
-    stdio: "ignore",
-    windowsHide: true,
-    detached: true,
-  });
-  gateway.unref();
-  const client = new AcpWorkerClient({
-    agentId: "codex",
-    logger: createLogger(),
-    command: fake.command,
-    env: fake.env,
-    gatewayPid: gateway.pid,
-    gatewayWatchdogPollMs: 50,
-  });
-
-  const startedAt = Date.now();
-  let sawStarted = false;
-  const runPromise = client.runTurn({
-    sessionKey: "session-watchdog",
-    cwd: tempRoot,
-    text: "stay alive",
-    onEvent: async (event) => {
-      if (event.type === "text_delta" && event.text?.includes("Working on stay alive")) {
-        sawStarted = true;
-      }
-    },
-  });
-  const observedRunPromise = runPromise.catch((error) => {
-    throw error;
-  });
-
-  try {
-    await waitFor(async () => sawStarted === true);
-
-    terminateChildProcess(gateway, { force: true });
-
-    await assert.rejects(
-      observedRunPromise,
-      /acpx exited with code|signal=SIGTERM|terminated/i,
-    );
-  } finally {
-    terminateChildProcess(gateway, { force: true });
-    await observedRunPromise.catch(() => undefined);
-  }
-
-  assert.ok(Date.now() - startedAt < 4_000, "watchdog should stop the worker quickly");
-  const finalStatus = await client.getSessionStatus({
-    sessionKey: "session-watchdog",
-    cwd: tempRoot,
-    agentId: "codex",
-  });
-  assert.match(finalStatus?.summary ?? "", /status=dead/);
-});
-
-async function createFakeAcpx(tempRoot: string): Promise<{ command: string; env: NodeJS.ProcessEnv }> {
-  const scriptPath = path.join(tempRoot, "fake-acpx.js");
-  const wrapperPath = path.join(tempRoot, process.platform === "win32" ? "fake-acpx.cmd" : "fake-acpx");
-
-  await writeFile(scriptPath, `
-const fs = require("node:fs/promises");
-const path = require("node:path");
-
-const args = process.argv.slice(2);
-const stateDir = process.env.FAKE_ACPX_STATE;
-
-function consumeGlobals(argv) {
-  const out = [...argv];
-  const result = [];
-  while (out.length > 0) {
-    const head = out[0];
-    if (head === "--format" || head === "--cwd" || head === "--ttl") {
-      out.shift();
-      out.shift();
-      continue;
-    }
-    if (head === "--json-strict" || head === "--approve-all" || head === "--approve-reads" || head === "--deny-all") {
-      out.shift();
-      continue;
-    }
-    result.push(...out);
-    break;
-  }
-  return result;
-}
-
-function flagValue(argv, name) {
-  const index = argv.indexOf(name);
-  if (index >= 0 && index + 1 < argv.length) {
-    return argv[index + 1];
-  }
-  return undefined;
-}
-
-async function readStdin() {
-  const chunks = [];
-  for await (const chunk of process.stdin) {
-    chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk));
-  }
-  return Buffer.concat(chunks).toString("utf8");
-}
-
-function isAlive(pid) {
-  if (!Number.isFinite(pid) || pid <= 0) {
-    return false;
-  }
-  try {
-    process.kill(pid, 0);
-    return true;
-  } catch (error) {
-    return error && typeof error === "object" && error.code === "EPERM";
-  }
-}
-
-async function writeJsonLine(value) {
-  process.stdout.write(JSON.stringify(value) + "\\n");
-}
-
-async function main() {
-  if (args.includes("--version")) {
-    process.stdout.write("0.3.1\\n");
-    return;
-  }
-
-  const rest = consumeGlobals(args);
-  const agent = rest[0];
-  const verb = rest[1];
-  const tail = rest.slice(2);
-  const sessionName = flagValue(tail, "--session") || flagValue(tail, "--name") || tail[1];
-  const sessionFile = sessionName ? path.join(stateDir, sessionName + ".json") : "";
-  const runningFile = sessionName ? path.join(stateDir, sessionName + ".running") : "";
-
-  async function sessionExists() {
-    try {
-      await fs.access(sessionFile);
-      return true;
-    } catch {
-      return false;
-    }
-  }
-
-  async function runningExists() {
-    try {
-      const payload = JSON.parse(await fs.readFile(runningFile, "utf8"));
-      return isAlive(payload && payload.pid);
-    } catch {
-      return false;
-    }
-  }
-
-  if (verb === "sessions" && tail[0] === "ensure") {
-    if (await sessionExists()) {
-      await writeJsonLine({ acpxRecordId: "record-" + sessionName, acpxSessionId: "backend-" + sessionName, agentSessionId: "agent-" + sessionName, agent });
-      return;
-    }
-    await writeJsonLine({ type: "error", code: "NO_SESSION", message: "missing session" });
-    return;
-  }
-
-  if (verb === "sessions" && tail[0] === "new") {
-    await fs.writeFile(sessionFile, JSON.stringify({ sessionName, agent }), "utf8");
-    await writeJsonLine({ acpxRecordId: "record-" + sessionName, acpxSessionId: "backend-" + sessionName, agentSessionId: "agent-" + sessionName, agent });
-    return;
-  }
-
-  if (verb === "status") {
-    if (!(await sessionExists())) {
-      await writeJsonLine({ type: "error", code: "NO_SESSION", message: "missing session" });
-      return;
-    }
-    await writeJsonLine({
-      status: await runningExists() ? "alive" : "dead",
-      acpxRecordId: "record-" + sessionName,
-      acpxSessionId: "backend-" + sessionName,
-      agentSessionId: "agent-" + sessionName,
-      pid: 1234,
-    });
-    return;
-  }
-
-  if (verb === "cancel") {
-    await fs.rm(runningFile, { force: true });
-    await writeJsonLine({ ok: true });
-    return;
-  }
-
-  if (verb === "prompt") {
-    const text = (await readStdin()).trim();
-    await fs.writeFile(runningFile, JSON.stringify({ pid: process.pid }), "utf8");
-    process.on("SIGTERM", async () => {
-      await fs.rm(runningFile, { force: true });
-      process.exit(143);
-    });
-    await new Promise((resolve) => setTimeout(resolve, 60));
-    await writeJsonLine({ text: "Working on " + text });
-    if (sessionName === "session-watchdog" || text.includes("stay alive")) {
-      setInterval(() => {}, 1_000);
-      return;
-    }
-    await new Promise((resolve) => setTimeout(resolve, 80));
-    await fs.rm(runningFile, { force: true });
-    await writeJsonLine({ type: "done" });
-    return;
-  }
-
-  if (verb === "sessions" && tail[0] === "close") {
-    await fs.rm(sessionFile, { force: true });
-    await fs.rm(runningFile, { force: true });
-    await writeJsonLine({ ok: true });
-    return;
-  }
-
-  process.stderr.write("unexpected args: " + JSON.stringify(args));
-  process.exit(1);
-}
-
-main().catch((error) => {
-  process.stderr.write(String(error && error.stack ? error.stack : error));
-  process.exit(1);
-});
-`, "utf8");
-
-  if (process.platform === "win32") {
-    await writeFile(wrapperPath, `@echo off\r\nnode "${scriptPath}" %*\r\n`, "utf8");
-  } else {
-    await writeFile(wrapperPath, `#!/usr/bin/env bash\nnode "${scriptPath}" "$@"\n`, "utf8");
-    await chmod(wrapperPath, 0o755);
-  }
-
-  return {
-    command: wrapperPath,
-    env: {
-      ...process.env,
-      FAKE_ACPX_STATE: tempRoot,
-    },
-  };
-}
-
-function createLogger() {
-  return {
-    info() {},
-    warn() {},
-    error() {},
-    debug() {},
-  };
-}
-
-async function waitFor(predicate: () => Promise<boolean>, timeoutMs = 2_000): Promise<void> {
-  const deadline = Date.now() + timeoutMs;
-  while (Date.now() < deadline) {
-    if (await predicate()) {
-      return;
-    }
-    await new Promise((resolve) => setTimeout(resolve, 25));
-  }
-  throw new Error("timed out waiting for condition");
-}

package/test/acpx-dependency.test.ts

@@ -1,133 +0,0 @@
-import test from "node:test";
-import assert from "node:assert/strict";
-import path from "node:path";
-import {
-  ACPX_EXPECTED_VERSION,
-  ACPX_PACKAGE_NAME,
-  ensureAcpxCli,
-} from "../src/dependencies/acpx.ts";
-
-const ROOT_PREFIX = process.platform === "win32" ? "C:\\clawspec-test" : "/tmp/clawspec-test";
-const OPENCLAW_PREFIX = process.platform === "win32" ? "C:\\openclaw-test" : "/opt/openclaw";
-
-const LOCAL_COMMAND = path.join(
-  ROOT_PREFIX,
-  "node_modules",
-  ".bin",
-  process.platform === "win32" ? "acpx.cmd" : "acpx",
-);
-const BUILTIN_COMMAND = path.join(
-  OPENCLAW_PREFIX,
-  "dist",
-  "extensions",
-  "acpx",
-  "node_modules",
-  ".bin",
-  process.platform === "win32" ? "acpx.cmd" : "acpx",
-);
-const OPENCLAW_RUNTIME_ENTRYPOINT = path.join(
-  OPENCLAW_PREFIX,
-  "dist",
-  "index.js",
-);
-
-test("ensureAcpxCli uses the global acpx command when available", async () => {
-  const calls: Array<{ command: string; args: string[] }> = [];
-  const result = await ensureAcpxCli({
-    pluginRoot: ROOT_PREFIX,
-    runner: async ({ command, args }) => {
-      calls.push({ command, args });
-      if (command === LOCAL_COMMAND) {
-        return { code: 1, stdout: "", stderr: "not found" };
-      }
-      if (command === "acpx") {
-        return { code: 0, stdout: `${ACPX_EXPECTED_VERSION}\n`, stderr: "" };
-      }
-      return { code: 1, stdout: "", stderr: "unexpected command" };
-    },
-  });
-
-  assert.equal(result.source, "global");
-  assert.equal(result.version, ACPX_EXPECTED_VERSION);
-  assert.equal(calls.some((call) => call.command === "npm"), false);
-});
-
-test("ensureAcpxCli accepts a newer global acpx version", async () => {
-  const calls: Array<{ command: string; args: string[] }> = [];
-  const result = await ensureAcpxCli({
-    pluginRoot: ROOT_PREFIX,
-    runner: async ({ command, args }) => {
-      calls.push({ command, args });
-      if (command === LOCAL_COMMAND) {
-        return { code: 1, stdout: "", stderr: "not found" };
-      }
-      if (command === "acpx") {
-        return { code: 0, stdout: "0.3.2\n", stderr: "" };
-      }
-      return { code: 1, stdout: "", stderr: "unexpected command" };
-    },
-  });
-
-  assert.equal(result.source, "global");
-  assert.equal(result.version, "0.3.2");
-  assert.equal(calls.some((call) => call.command === "npm"), false);
-});
-
-test("ensureAcpxCli prefers the OpenClaw builtin acpx over an incompatible PATH acpx", async () => {
-  const calls: Array<{ command: string; args: string[] }> = [];
-  const result = await ensureAcpxCli({
-    pluginRoot: ROOT_PREFIX,
-    runtimeEntrypoint: OPENCLAW_RUNTIME_ENTRYPOINT,
-    runner: async ({ command, args }) => {
-      calls.push({ command, args });
-      if (command === LOCAL_COMMAND) {
-        return { code: 1, stdout: "", stderr: "not found" };
-      }
-      if (command === BUILTIN_COMMAND) {
-        return { code: 0, stdout: `${ACPX_EXPECTED_VERSION}\n`, stderr: "" };
-      }
-      if (command === "acpx") {
-        return { code: 0, stdout: "0.1.15\n", stderr: "" };
-      }
-      return { code: 1, stdout: "", stderr: "unexpected command" };
-    },
-  });
-
-  assert.equal(result.source, "builtin");
-  assert.equal(result.version, ACPX_EXPECTED_VERSION);
-  assert.equal(result.command, BUILTIN_COMMAND);
-  assert.equal(calls.some((call) => call.command === "npm"), false);
-});
-
-test("ensureAcpxCli installs a plugin-local acpx when none is available", async () => {
-  const calls: Array<{ command: string; args: string[] }> = [];
-  let localCheckCount = 0;
-
-  const result = await ensureAcpxCli({
-    pluginRoot: ROOT_PREFIX,
-    runner: async ({ command, args }) => {
-      calls.push({ command, args });
-      if (command === LOCAL_COMMAND) {
-        localCheckCount += 1;
-        if (localCheckCount === 1) {
-          return { code: 1, stdout: "", stderr: "not found" };
-        }
-        return { code: 0, stdout: `${ACPX_EXPECTED_VERSION}\n`, stderr: "" };
-      }
-      if (command === "acpx") {
-        return { code: 1, stdout: "", stderr: "not found" };
-      }
-      if (command === "npm") {
-        return { code: 0, stdout: "installed\n", stderr: "" };
-      }
-      return { code: 1, stdout: "", stderr: "unexpected command" };
-    },
-  });
-
-  assert.equal(result.source, "local");
-  assert.equal(result.version, ACPX_EXPECTED_VERSION);
-  assert.equal(
-    calls.some((call) => call.command === "npm" && call.args.includes(`${ACPX_PACKAGE_NAME}@${ACPX_EXPECTED_VERSION}`)),
-    true,
-  );
-});