8f2483e
@@ -15,6 +15,7 @@
import type { EnvName } from "./data.ts";
import { envPull } from "./data.ts";
import { isReservedAppEnvName } from "../core/app_env.ts";
import { err, ok, type Result } from "../kernel/result.ts";
import { stripForgeDirs } from "../runs/paths.ts";
export interface ProcessHandle {
  readonly pid: number;
@@ -143,22 +144,6 @@
function operatorVars(
  return out;
}
/**
 * The forge's own directories stripped from a line of output — the data
 * directory, the app's id, the environment and the per-commit checkout are
 * the forge's private layout, not the app's; a stack trace naming
 * `dir/src/server.ts:1:11` reads as `src/server.ts:1:11` instead, the path
 * the app's own source control knows. Applied where output is captured, not
 * filtered — a line with no match passes through whole, so a message never
 * loses its stack for the sake of hiding a directory.
 */
function stripForgeDirs(dirs: readonly string[], line: string): string {
  return dirs.reduce(
    (out, dir) => out.split(`${dir}/`).join("").split(dir).join("."),
    line,
  );
}
/**
 * Run a step to completion, streaming its output. A non-zero exit, a
 * timeout, or an abort is an Err with the reason a person would want.
@@ -13,6 +13,7 @@
 */
import { childEnv, pump } from "../apps/process.ts";
import { stripForgeDirs } from "../runs/paths.ts";
import type { SandboxPolicy } from "./sandbox.ts";
export interface ClaudeInput {
@@ -209,7 +210,7 @@
export async function runClaude(input: ClaudeInput): Promise<ClaudeOutcome> {
      return;
    }
    if (type === "assistant") {
      for (const text of assistantLines(e)) input.log(text);
      for (const text of assistantLines(e, input.cwd)) input.log(text);
      return;
    }
    if (type === "result") {
@@ -309,7 +310,7 @@
export async function runClaude(input: ClaudeInput): Promise<ClaudeOutcome> {
}
/** The lines a person wants from an assistant turn: its words and its tool calls. */
function assistantLines(e: Record<string, unknown>): string[] {
function assistantLines(e: Record<string, unknown>, cwd: string): string[] {
  const message = e["message"];
  if (typeof message !== "object" || message === null) return [];
  const content = (message as Record<string, unknown>)["content"];
@@ -321,14 +322,14 @@
function assistantLines(e: Record<string, unknown>): string[] {
        if (line.trim() !== "") out.push(line);
    } else if (block["type"] === "tool_use") {
      out.push(
        `→ ${describeTool(String(block["name"] ?? "tool"), block["input"])}`,
        `→ ${describeTool(String(block["name"] ?? "tool"), block["input"], cwd)}`,
      );
    }
  }
  return out;
}
function describeTool(name: string, input: unknown): string {
function describeTool(name: string, input: unknown, cwd: string): string {
  const args =
    typeof input === "object" && input !== null
      ? (input as Record<string, unknown>)
@@ -340,15 +341,18 @@
function describeTool(name: string, input: unknown): string {
    }
    return "";
  };
  const detail = first([
    "command",
    "file_path",
    "path",
    "pattern",
    "url",
    "description",
    "prompt",
  ]);
  const detail = stripForgeDirs(
    [cwd],
    first([
      "command",
      "file_path",
      "path",
      "pattern",
      "url",
      "description",
      "prompt",
    ]),
  );
  const short = detail.length > 160 ? `${detail.slice(0, 157)}…` : detail;
  return short === "" ? name : `${name} ${short}`;
}
@@ -0,0 +1,20 @@
/**
 * The forge's own directories stripped from a line of output — the data
 * directory, the app's id, the environment and the per-commit checkout are
 * the forge's private layout, not the app's; a stack trace naming
 * `dir/src/server.ts:1:11` reads as `src/server.ts:1:11` instead, the path
 * the app's own source control knows. Applied where output is captured, not
 * filtered — a line with no match passes through whole, so a message never
 * loses its stack for the sake of hiding a directory.
 *
 * An empty `dir` is dropped rather than stripped: `"".split("dir").join(".")`
 * would rewrite every character boundary of the line.
 */
export function stripForgeDirs(dirs: readonly string[], line: string): string {
  return dirs
    .filter((dir) => dir !== "")
    .reduce(
      (out, dir) => out.split(`${dir}/`).join("").split(dir).join("."),
      line,
    );
}
@@ -40,6 +40,25 @@
import { listRuns, type Run } from "../src/core/runs.ts";
import { createUser, type User } from "../src/core/users.ts";
import { serve, type Servers } from "../src/http/server.ts";
import { readRunLog } from "../src/runs/log.ts";
import { stripForgeDirs } from "../src/runs/paths.ts";
describe("stripForgeDirs", () => {
  test("strips a known directory, leaves the rest of the path", () => {
    expect(stripForgeDirs(["/data/crew/bot/1/2"], "/data/crew/bot/1/2/src/a.ts")).toBe(
      "src/a.ts",
    );
  });
  test("a line with no match passes through whole", () => {
    expect(stripForgeDirs(["/data/crew/bot/1/2"], "/usr/bin/ssh")).toBe(
      "/usr/bin/ssh",
    );
  });
  test("an empty directory is dropped, not used as a prefix", () => {
    expect(stripForgeDirs([""], "/usr/bin/ssh")).toBe("/usr/bin/ssh");
  });
});
describe("the crew, with a stand-in Claude Code", () => {
  let dataDir: string;
@@ -104,7 +123,7 @@
fi
if grep -q "The check on your pull" "${promptFile}"; then echo "daffodils" >> CREW.md; fi
echo "work by the crew $(date +%s%N)" >> CREW.md
git add -A && git commit -qm "crew work" && git push -q -u origin HEAD
echo '{"type":"assistant","message":{"content":[{"type":"text","text":"Added CREW.md."},{"type":"tool_use","name":"Bash","input":{"command":"git push"}}]}}'
echo '{"type":"assistant","message":{"content":[{"type":"text","text":"Added CREW.md."},{"type":"tool_use","name":"Read","input":{"file_path":"'"$(pwd)"'/CREW.md"}},{"type":"tool_use","name":"Bash","input":{"command":"cat /etc/hosts"}},{"type":"tool_use","name":"Bash","input":{"command":"git push"}}]}}'
echo '{"type":"result","subtype":"success","is_error":false,"result":"Added CREW.md as asked.","total_cost_usd":0.01,"num_turns":3,"session_id":"fake-1","terminal_reason":"completed"}'
`,
    );
@@ -245,6 +264,11 @@
echo '{"type":"result","subtype":"success","is_error":false,"result":"Added CREW
    ).toBe(pull.headOid);
    expect(pull.body).toContain("Added CREW.md as asked.");
    expect(pull.body).toContain(`Closes #${issueNumber}`);
    // A tool line names the file the way the repository does — the run's
    // workdir stripped off — while a path outside the workdir is untouched.
    const log = readRunLog(dataDir, run.id).lines.join("\n");
    expect(log).toContain("→ Read CREW.md");
    expect(log).toContain("→ Bash cat /etc/hosts");
    // The run's credential is gone; the clone stays for the follow-up.
    const tokens = app.db
      .query<
		@@ -15,6 +15,7 @@ import type { EnvName } from "./data.ts";
15	15	import { envPull } from "./data.ts";
16	16	import { isReservedAppEnvName } from "../core/app_env.ts";
17	17	import { err, ok, type Result } from "../kernel/result.ts";
	18	import { stripForgeDirs } from "../runs/paths.ts";
18	19
19	20	export interface ProcessHandle {
20	21	readonly pid: number;
		@@ -143,22 +144,6 @@ function operatorVars(
143	144	return out;
144	145	}
145	146
146		/**
147		* The forge's own directories stripped from a line of output — the data
148		* directory, the app's id, the environment and the per-commit checkout are
149		* the forge's private layout, not the app's; a stack trace naming
150		* `dir/src/server.ts:1:11` reads as `src/server.ts:1:11` instead, the path
151		* the app's own source control knows. Applied where output is captured, not
152		* filtered — a line with no match passes through whole, so a message never
153		* loses its stack for the sake of hiding a directory.
154		*/
155		function stripForgeDirs(dirs: readonly string[], line: string): string {
156		return dirs.reduce(
157		(out, dir) => out.split(`${dir}/`).join("").split(dir).join("."),
158		line,
159		);
160		}
161
162	147	/**
163	148	* Run a step to completion, streaming its output. A non-zero exit, a
164	149	* timeout, or an abort is an Err with the reason a person would want.
		@@ -13,6 +13,7 @@
13	13	*/
14	14
15	15	import { childEnv, pump } from "../apps/process.ts";
	16	import { stripForgeDirs } from "../runs/paths.ts";
16	17	import type { SandboxPolicy } from "./sandbox.ts";
17	18
18	19	export interface ClaudeInput {
		@@ -209,7 +210,7 @@ export async function runClaude(input: ClaudeInput): Promise<ClaudeOutcome> {
209	210	return;
210	211	}
211	212	if (type === "assistant") {
212		for (const text of assistantLines(e)) input.log(text);
	213	for (const text of assistantLines(e, input.cwd)) input.log(text);
213	214	return;
214	215	}
215	216	if (type === "result") {
		@@ -309,7 +310,7 @@ export async function runClaude(input: ClaudeInput): Promise<ClaudeOutcome> {
309	310	}
310	311
311	312	/** The lines a person wants from an assistant turn: its words and its tool calls. */
312		function assistantLines(e: Record<string, unknown>): string[] {
	313	function assistantLines(e: Record<string, unknown>, cwd: string): string[] {
313	314	const message = e["message"];
314	315	if (typeof message !== "object" \|\| message === null) return [];
315	316	const content = (message as Record<string, unknown>)["content"];
		@@ -321,14 +322,14 @@ function assistantLines(e: Record<string, unknown>): string[] {
321	322	if (line.trim() !== "") out.push(line);
322	323	} else if (block["type"] === "tool_use") {
323	324	out.push(
324		`→ ${describeTool(String(block["name"] ?? "tool"), block["input"])}`,
	325	`→ ${describeTool(String(block["name"] ?? "tool"), block["input"], cwd)}`,
325	326	);
326	327	}
327	328	}
328	329	return out;
329	330	}
330	331
331		function describeTool(name: string, input: unknown): string {
	332	function describeTool(name: string, input: unknown, cwd: string): string {
332	333	const args =
333	334	typeof input === "object" && input !== null
334	335	? (input as Record<string, unknown>)
		@@ -340,15 +341,18 @@ function describeTool(name: string, input: unknown): string {
340	341	}
341	342	return "";
342	343	};
343		const detail = first([
344		"command",
345		"file_path",
346		"path",
347		"pattern",
348		"url",
349		"description",
350		"prompt",
351		]);
	344	const detail = stripForgeDirs(
	345	[cwd],
	346	first([
	347	"command",
	348	"file_path",
	349	"path",
	350	"pattern",
	351	"url",
	352	"description",
	353	"prompt",
	354	]),
	355	);
352	356	const short = detail.length > 160 ? `${detail.slice(0, 157)}…` : detail;
353	357	return short === "" ? name : `${name} ${short}`;
354	358	}
		@@ -0,0 +1,20 @@
	1	/**
	2	* The forge's own directories stripped from a line of output — the data
	3	* directory, the app's id, the environment and the per-commit checkout are
	4	* the forge's private layout, not the app's; a stack trace naming
	5	* `dir/src/server.ts:1:11` reads as `src/server.ts:1:11` instead, the path
	6	* the app's own source control knows. Applied where output is captured, not
	7	* filtered — a line with no match passes through whole, so a message never
	8	* loses its stack for the sake of hiding a directory.
	9	*
	10	* An empty `dir` is dropped rather than stripped: `"".split("dir").join(".")`
	11	* would rewrite every character boundary of the line.
	12	*/
	13	export function stripForgeDirs(dirs: readonly string[], line: string): string {
	14	return dirs
	15	.filter((dir) => dir !== "")
	16	.reduce(
	17	(out, dir) => out.split(`${dir}/`).join("").split(dir).join("."),
	18	line,
	19	);
	20	}
		@@ -40,6 +40,25 @@ import { listRuns, type Run } from "../src/core/runs.ts";
40	40	import { createUser, type User } from "../src/core/users.ts";
41	41	import { serve, type Servers } from "../src/http/server.ts";
42	42	import { readRunLog } from "../src/runs/log.ts";
	43	import { stripForgeDirs } from "../src/runs/paths.ts";
	44
	45	describe("stripForgeDirs", () => {
	46	test("strips a known directory, leaves the rest of the path", () => {
	47	expect(stripForgeDirs(["/data/crew/bot/1/2"], "/data/crew/bot/1/2/src/a.ts")).toBe(
	48	"src/a.ts",
	49	);
	50	});
	51
	52	test("a line with no match passes through whole", () => {
	53	expect(stripForgeDirs(["/data/crew/bot/1/2"], "/usr/bin/ssh")).toBe(
	54	"/usr/bin/ssh",
	55	);
	56	});
	57
	58	test("an empty directory is dropped, not used as a prefix", () => {
	59	expect(stripForgeDirs([""], "/usr/bin/ssh")).toBe("/usr/bin/ssh");
	60	});
	61	});
43	62
44	63	describe("the crew, with a stand-in Claude Code", () => {
45	64	let dataDir: string;
		@@ -104,7 +123,7 @@ fi
104	123	if grep -q "The check on your pull" "${promptFile}"; then echo "daffodils" >> CREW.md; fi
105	124	echo "work by the crew $(date +%s%N)" >> CREW.md
106	125	git add -A && git commit -qm "crew work" && git push -q -u origin HEAD
107		echo '{"type":"assistant","message":{"content":[{"type":"text","text":"Added CREW.md."},{"type":"tool_use","name":"Bash","input":{"command":"git push"}}]}}'
	126	echo '{"type":"assistant","message":{"content":[{"type":"text","text":"Added CREW.md."},{"type":"tool_use","name":"Read","input":{"file_path":"'"$(pwd)"'/CREW.md"}},{"type":"tool_use","name":"Bash","input":{"command":"cat /etc/hosts"}},{"type":"tool_use","name":"Bash","input":{"command":"git push"}}]}}'
108	127	echo '{"type":"result","subtype":"success","is_error":false,"result":"Added CREW.md as asked.","total_cost_usd":0.01,"num_turns":3,"session_id":"fake-1","terminal_reason":"completed"}'
109	128	`,
110	129	);
		@@ -245,6 +264,11 @@ echo '{"type":"result","subtype":"success","is_error":false,"result":"Added CREW
245	264	).toBe(pull.headOid);
246	265	expect(pull.body).toContain("Added CREW.md as asked.");
247	266	expect(pull.body).toContain(`Closes #${issueNumber}`);
	267	// A tool line names the file the way the repository does — the run's
	268	// workdir stripped off — while a path outside the workdir is untouched.
	269	const log = readRunLog(dataDir, run.id).lines.join("\n");
	270	expect(log).toContain("→ Read CREW.md");
	271	expect(log).toContain("→ Bash cat /etc/hosts");
248	272	// The run's credential is gone; the clone stays for the follow-up.
249	273	const tokens = app.db
250	274	.query<