The open-source app everyone uses to manage agents at work
TypeScript acpxagent-orchestrationagent-skillsagentic-aiai-agentsai-engineeringai-governanceai-toolsautonomous-agentsclaudeclaude-codeclaude-skillscodexhermesllmmcpmulti-agentopenclawproject-managementworkflow-automation
Log resolved adapter command in run metadata
dottacadfcd1bc6d8
diff --git a/packages/adapter-utils/src/server-utils.ts b/packages/adapter-utils/src/server-utils.tsindex 12989f72e7..4a5affdff5 100644--- a/packages/adapter-utils/src/server-utils.ts+++ b/packages/adapter-utils/src/server-utils.ts@@ -201,6 +201,33 @@ export function redactEnvForLogs(env: Record<string, string>): Record<string, streturn redacted;}+export function buildInvocationEnvForLogs(+ env: Record<string, string>,+ options: {+ runtimeEnv?: NodeJS.ProcessEnv | Record<string, string>;+ includeRuntimeKeys?: string[];+ resolvedCommand?: string | null;+ resolvedCommandEnvKey?: string;+ } = {},+): Record<string, string> {+ const merged: Record<string, string> = { ...env };+ const runtimeEnv = options.runtimeEnv ?? {};++ for (const key of options.includeRuntimeKeys ?? []) {+ if (key in merged) continue;+ const value = runtimeEnv[key];+ if (typeof value !== "string" || value.length === 0) continue;+ merged[key] = value;+ }++ const resolvedCommand = options.resolvedCommand?.trim();+ if (resolvedCommand) {+ merged[options.resolvedCommandEnvKey ?? "PAPERCLIP_RESOLVED_COMMAND"] = resolvedCommand;+ }++ return redactEnvForLogs(merged);+}+export function buildPaperclipEnv(agent: { id: string; companyId: string }): Record<string, string> {const resolveHostForUrl = (rawHost: string): string => {const host = rawHost.trim();@@ -269,6 +296,10 @@ async function resolveCommandPath(command: string, cwd: string, env: NodeJS.Procreturn null;}+export async function resolveCommandForLogs(command: string, cwd: string, env: NodeJS.ProcessEnv): Promise<string> {+ return (await resolveCommandPath(command, cwd, env)) ?? command;+}+function quoteForCmd(arg: string) {if (!arg.length) return '""';const escaped = arg.replace(/"/g, '""');diff --git a/packages/adapters/claude-local/src/server/execute.ts b/packages/adapters/claude-local/src/server/execute.tsindex 8ac1d7ee6d..c7d6c6a8b2 100644--- a/packages/adapters/claude-local/src/server/execute.ts+++ b/packages/adapters/claude-local/src/server/execute.ts@@ -14,10 +14,11 @@ import {buildPaperclipEnv,readPaperclipRuntimeSkillEntries,joinPromptSections,- redactEnvForLogs,+ buildInvocationEnvForLogs,ensureAbsoluteDirectory,ensureCommandResolvable,ensurePathInEnv,+ resolveCommandForLogs,renderTemplate,runChildProcess,} from "@paperclipai/adapter-utils/server-utils";@@ -68,11 +69,13 @@ interface ClaudeExecutionInput {interface ClaudeRuntimeConfig {command: string;+ resolvedCommand: string;cwd: string;workspaceId: string | null;workspaceRepoUrl: string | null;workspaceRepoRef: string | null;env: Record<string, string>;+ loggedEnv: Record<string, string>;timeoutSec: number;graceSec: number;extraArgs: string[];@@ -236,6 +239,12 @@ async function buildClaudeRuntimeConfig(input: ClaudeExecutionInput): Promise<Clconst runtimeEnv = ensurePathInEnv({ ...process.env, ...env });await ensureCommandResolvable(command, cwd, runtimeEnv);+ const resolvedCommand = await resolveCommandForLogs(command, cwd, runtimeEnv);+ const loggedEnv = buildInvocationEnvForLogs(env, {+ runtimeEnv,+ includeRuntimeKeys: ["HOME", "CLAUDE_CONFIG_DIR"],+ resolvedCommand,+ });const timeoutSec = asNumber(config.timeoutSec, 0);const graceSec = asNumber(config.graceSec, 20);@@ -247,11 +256,13 @@ async function buildClaudeRuntimeConfig(input: ClaudeExecutionInput): Promise<Clreturn {command,+ resolvedCommand,cwd,workspaceId,workspaceRepoUrl,workspaceRepoRef,env,+ loggedEnv,timeoutSec,graceSec,extraArgs,@@ -324,11 +335,13 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExec});const {command,+ resolvedCommand,cwd,workspaceId,workspaceRepoUrl,workspaceRepoRef,env,+ loggedEnv,timeoutSec,graceSec,extraArgs,@@ -440,11 +453,11 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExecif (onMeta) {await onMeta({adapterType: "claude_local",- command,+ command: resolvedCommand,cwd,commandArgs: args,commandNotes,- env: redactEnvForLogs(env),+ env: loggedEnv,prompt,promptMetrics,context,diff --git a/packages/adapters/codex-local/src/server/execute.ts b/packages/adapters/codex-local/src/server/execute.tsindex 35c681ee8d..63d2dc95e9 100644--- a/packages/adapters/codex-local/src/server/execute.ts+++ b/packages/adapters/codex-local/src/server/execute.ts@@ -9,12 +9,13 @@ import {asStringArray,parseObject,buildPaperclipEnv,- redactEnvForLogs,+ buildInvocationEnvForLogs,ensureAbsoluteDirectory,ensureCommandResolvable,ensurePaperclipSkillSymlink,ensurePathInEnv,readPaperclipRuntimeSkillEntries,+ resolveCommandForLogs,resolvePaperclipDesiredSkillNames,renderTemplate,joinPromptSections,@@ -383,6 +384,12 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExecconst billingType = resolveCodexBillingType(effectiveEnv);const runtimeEnv = ensurePathInEnv(effectiveEnv);await ensureCommandResolvable(command, cwd, runtimeEnv);+ const resolvedCommand = await resolveCommandForLogs(command, cwd, runtimeEnv);+ const loggedEnv = buildInvocationEnvForLogs(env, {+ runtimeEnv,+ includeRuntimeKeys: ["HOME"],+ resolvedCommand,+ });const timeoutSec = asNumber(config.timeoutSec, 0);const graceSec = asNumber(config.graceSec, 20);@@ -490,14 +497,14 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExecif (onMeta) {await onMeta({adapterType: "codex_local",- command,+ command: resolvedCommand,cwd,commandNotes,commandArgs: args.map((value, idx) => {if (idx === args.length - 1 && value !== "-") return `<prompt ${prompt.length} chars>`;return value;}),- env: redactEnvForLogs(env),+ env: loggedEnv,prompt,promptMetrics,context,diff --git a/packages/adapters/cursor-local/src/server/execute.ts b/packages/adapters/cursor-local/src/server/execute.tsindex df33969001..ed41754a9e 100644--- a/packages/adapters/cursor-local/src/server/execute.ts+++ b/packages/adapters/cursor-local/src/server/execute.ts@@ -9,12 +9,13 @@ import {asStringArray,parseObject,buildPaperclipEnv,- redactEnvForLogs,+ buildInvocationEnvForLogs,ensureAbsoluteDirectory,ensureCommandResolvable,ensurePaperclipSkillSymlink,ensurePathInEnv,readPaperclipRuntimeSkillEntries,+ resolveCommandForLogs,resolvePaperclipDesiredSkillNames,removeMaintainerOnlySkillSymlinks,renderTemplate,@@ -271,6 +272,12 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExecconst billingType = resolveCursorBillingType(effectiveEnv);const runtimeEnv = ensurePathInEnv(effectiveEnv);await ensureCommandResolvable(command, cwd, runtimeEnv);+ const resolvedCommand = await resolveCommandForLogs(command, cwd, runtimeEnv);+ const loggedEnv = buildInvocationEnvForLogs(env, {+ runtimeEnv,+ includeRuntimeKeys: ["HOME"],+ resolvedCommand,+ });const timeoutSec = asNumber(config.timeoutSec, 0);const graceSec = asNumber(config.graceSec, 20);@@ -383,11 +390,11 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExecif (onMeta) {await onMeta({adapterType: "cursor",- command,+ command: resolvedCommand,cwd,commandNotes,commandArgs: args,- env: redactEnvForLogs(env),+ env: loggedEnv,prompt,promptMetrics,context,diff --git a/packages/adapters/gemini-local/src/server/execute.ts b/packages/adapters/gemini-local/src/server/execute.tsindex 36b28ad8ba..4701a18511 100644--- a/packages/adapters/gemini-local/src/server/execute.ts+++ b/packages/adapters/gemini-local/src/server/execute.ts@@ -10,16 +10,17 @@ import {asString,asStringArray,buildPaperclipEnv,+ buildInvocationEnvForLogs,ensureAbsoluteDirectory,ensureCommandResolvable,ensurePaperclipSkillSymlink,joinPromptSections,ensurePathInEnv,readPaperclipRuntimeSkillEntries,+ resolveCommandForLogs,resolvePaperclipDesiredSkillNames,removeMaintainerOnlySkillSymlinks,parseObject,- redactEnvForLogs,renderTemplate,runChildProcess,} from "@paperclipai/adapter-utils/server-utils";@@ -220,6 +221,12 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExecconst billingType = resolveGeminiBillingType(effectiveEnv);const runtimeEnv = ensurePathInEnv(effectiveEnv);await ensureCommandResolvable(command, cwd, runtimeEnv);+ const resolvedCommand = await resolveCommandForLogs(command, cwd, runtimeEnv);+ const loggedEnv = buildInvocationEnvForLogs(env, {+ runtimeEnv,+ includeRuntimeKeys: ["HOME"],+ resolvedCommand,+ });const timeoutSec = asNumber(config.timeoutSec, 0);const graceSec = asNumber(config.graceSec, 20);@@ -333,13 +340,13 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExecif (onMeta) {await onMeta({adapterType: "gemini_local",- command,+ command: resolvedCommand,cwd,commandNotes,commandArgs: args.map((value, index) => (index === args.length - 1 ? `<prompt ${prompt.length} chars>` : value)),- env: redactEnvForLogs(env),+ env: loggedEnv,prompt,promptMetrics,context,diff --git a/packages/adapters/opencode-local/src/server/execute.ts b/packages/adapters/opencode-local/src/server/execute.tsindex f3a5ae5088..7c034c692a 100644--- a/packages/adapters/opencode-local/src/server/execute.ts+++ b/packages/adapters/opencode-local/src/server/execute.ts@@ -10,11 +10,12 @@ import {parseObject,buildPaperclipEnv,joinPromptSections,- redactEnvForLogs,+ buildInvocationEnvForLogs,ensureAbsoluteDirectory,ensureCommandResolvable,ensurePaperclipSkillSymlink,ensurePathInEnv,+ resolveCommandForLogs,renderTemplate,runChildProcess,readPaperclipRuntimeSkillEntries,@@ -186,6 +187,12 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExec),);await ensureCommandResolvable(command, cwd, runtimeEnv);+ const resolvedCommand = await resolveCommandForLogs(command, cwd, runtimeEnv);+ const loggedEnv = buildInvocationEnvForLogs(preparedRuntimeConfig.env, {+ runtimeEnv,+ includeRuntimeKeys: ["HOME"],+ resolvedCommand,+ });await ensureOpenCodeModelConfiguredAndAvailable({model,@@ -298,11 +305,11 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExecif (onMeta) {await onMeta({adapterType: "opencode_local",- command,+ command: resolvedCommand,cwd,commandNotes,commandArgs: [...args, `<stdin prompt ${prompt.length} chars>`],- env: redactEnvForLogs(preparedRuntimeConfig.env),+ env: loggedEnv,prompt,promptMetrics,context,diff --git a/packages/adapters/pi-local/src/server/execute.ts b/packages/adapters/pi-local/src/server/execute.tsindex a78bc1d487..b1d9d801d6 100644--- a/packages/adapters/pi-local/src/server/execute.ts+++ b/packages/adapters/pi-local/src/server/execute.ts@@ -10,12 +10,13 @@ import {parseObject,buildPaperclipEnv,joinPromptSections,- redactEnvForLogs,+ buildInvocationEnvForLogs,ensureAbsoluteDirectory,ensureCommandResolvable,ensurePaperclipSkillSymlink,ensurePathInEnv,readPaperclipRuntimeSkillEntries,+ resolveCommandForLogs,resolvePaperclipDesiredSkillNames,removeMaintainerOnlySkillSymlinks,renderTemplate,@@ -204,6 +205,12 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExec),);await ensureCommandResolvable(command, cwd, runtimeEnv);+ const resolvedCommand = await resolveCommandForLogs(command, cwd, runtimeEnv);+ const loggedEnv = buildInvocationEnvForLogs(env, {+ runtimeEnv,+ includeRuntimeKeys: ["HOME"],+ resolvedCommand,+ });// Validate model is available before executionawait ensurePiModelConfiguredAndAvailable({@@ -356,11 +363,11 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExecif (onMeta) {await onMeta({adapterType: "pi_local",- command,+ command: resolvedCommand,cwd,commandNotes,commandArgs: args,- env: redactEnvForLogs(env),+ env: loggedEnv,prompt: userPrompt,promptMetrics,context,diff --git a/server/src/__tests__/claude-local-execute.test.ts b/server/src/__tests__/claude-local-execute.test.tsnew file mode 100644index 0000000000..be933bca8f--- /dev/null+++ b/server/src/__tests__/claude-local-execute.test.ts@@ -0,0 +1,99 @@+import { describe, expect, it } from "vitest";+import fs from "node:fs/promises";+import os from "node:os";+import path from "node:path";+import { execute } from "@paperclipai/adapter-claude-local/server";++async function writeFakeClaudeCommand(commandPath: string): Promise<void> {+ const script = `#!/usr/bin/env node+const fs = require("node:fs");++const capturePath = process.env.PAPERCLIP_TEST_CAPTURE_PATH;+const payload = {+ argv: process.argv.slice(2),+ prompt: fs.readFileSync(0, "utf8"),+ claudeConfigDir: process.env.CLAUDE_CONFIG_DIR || null,+};+if (capturePath) {+ fs.writeFileSync(capturePath, JSON.stringify(payload), "utf8");+}+console.log(JSON.stringify({ type: "system", subtype: "init", session_id: "claude-session-1", model: "claude-sonnet" }));+console.log(JSON.stringify({ type: "assistant", session_id: "claude-session-1", message: { content: [{ type: "text", text: "hello" }] } }));+console.log(JSON.stringify({ type: "result", session_id: "claude-session-1", result: "hello", usage: { input_tokens: 1, cache_read_input_tokens: 0, output_tokens: 1 } }));+`;+ await fs.writeFile(commandPath, script, "utf8");+ await fs.chmod(commandPath, 0o755);+}++describe("claude execute", () => {+ it("logs HOME, CLAUDE_CONFIG_DIR, and the resolved executable path in invocation metadata", async () => {+ const root = await fs.mkdtemp(path.join(os.tmpdir(), "paperclip-claude-execute-meta-"));+ const workspace = path.join(root, "workspace");+ const binDir = path.join(root, "bin");+ const commandPath = path.join(binDir, "claude");+ const capturePath = path.join(root, "capture.json");+ const claudeConfigDir = path.join(root, "claude-config");+ await fs.mkdir(workspace, { recursive: true });+ await fs.mkdir(binDir, { recursive: true });+ await fs.mkdir(claudeConfigDir, { recursive: true });+ await writeFakeClaudeCommand(commandPath);++ const previousHome = process.env.HOME;+ const previousPath = process.env.PATH;+ const previousClaudeConfigDir = process.env.CLAUDE_CONFIG_DIR;+ process.env.HOME = root;+ process.env.PATH = `${binDir}${path.delimiter}${process.env.PATH ?? ""}`;+ process.env.CLAUDE_CONFIG_DIR = claudeConfigDir;++ let loggedCommand: string | null = null;+ let loggedEnv: Record<string, string> = {};+ try {+ const result = await execute({+ runId: "run-meta",+ agent: {+ id: "agent-1",+ companyId: "company-1",+ name: "Claude Coder",+ adapterType: "claude_local",+ adapterConfig: {},+ },+ runtime: {+ sessionId: null,+ sessionParams: null,+ sessionDisplayId: null,+ taskKey: null,+ },+ config: {+ command: "claude",+ cwd: workspace,+ env: {+ PAPERCLIP_TEST_CAPTURE_PATH: capturePath,+ },+ promptTemplate: "Follow the paperclip heartbeat.",+ },+ context: {},+ authToken: "run-jwt-token",+ onLog: async () => {},+ onMeta: async (meta) => {+ loggedCommand = meta.command;+ loggedEnv = meta.env ?? {};+ },+ });++ expect(result.exitCode).toBe(0);+ expect(result.errorMessage).toBeNull();+ expect(loggedCommand).toBe(commandPath);+ expect(loggedEnv.HOME).toBe(root);+ expect(loggedEnv.CLAUDE_CONFIG_DIR).toBe(claudeConfigDir);+ expect(loggedEnv.PAPERCLIP_RESOLVED_COMMAND).toBe(commandPath);+ } finally {+ if (previousHome === undefined) delete process.env.HOME;+ else process.env.HOME = previousHome;+ if (previousPath === undefined) delete process.env.PATH;+ else process.env.PATH = previousPath;+ if (previousClaudeConfigDir === undefined) delete process.env.CLAUDE_CONFIG_DIR;+ else process.env.CLAUDE_CONFIG_DIR = previousClaudeConfigDir;+ await fs.rm(root, { recursive: true, force: true });+ }+ });+});diff --git a/server/src/__tests__/codex-local-execute.test.ts b/server/src/__tests__/codex-local-execute.test.tsindex b83e3db7bd..4f584435ab 100644--- a/server/src/__tests__/codex-local-execute.test.ts+++ b/server/src/__tests__/codex-local-execute.test.ts@@ -195,6 +195,70 @@ describe("codex execute", () => {}});+ it("logs HOME and the resolved executable path in invocation metadata", async () => {+ const root = await fs.mkdtemp(path.join(os.tmpdir(), "paperclip-codex-execute-meta-"));+ const workspace = path.join(root, "workspace");+ const binDir = path.join(root, "bin");+ const commandPath = path.join(binDir, "codex");+ const capturePath = path.join(root, "capture.json");+ await fs.mkdir(workspace, { recursive: true });+ await fs.mkdir(binDir, { recursive: true });+ await writeFakeCodexCommand(commandPath);++ const previousHome = process.env.HOME;+ const previousPath = process.env.PATH;+ process.env.HOME = root;+ process.env.PATH = `${binDir}${path.delimiter}${process.env.PATH ?? ""}`;++ let loggedCommand: string | null = null;+ let loggedEnv: Record<string, string> = {};+ try {+ const result = await execute({+ runId: "run-meta",+ agent: {+ id: "agent-1",+ companyId: "company-1",+ name: "Codex Coder",+ adapterType: "codex_local",+ adapterConfig: {},+ },+ runtime: {+ sessionId: null,+ sessionParams: null,+ sessionDisplayId: null,+ taskKey: null,+ },+ config: {+ command: "codex",+ cwd: workspace,+ env: {+ PAPERCLIP_TEST_CAPTURE_PATH: capturePath,+ },+ promptTemplate: "Follow the paperclip heartbeat.",+ },+ context: {},+ authToken: "run-jwt-token",+ onLog: async () => {},+ onMeta: async (meta) => {+ loggedCommand = meta.command;+ loggedEnv = meta.env ?? {};+ },+ });++ expect(result.exitCode).toBe(0);+ expect(result.errorMessage).toBeNull();+ expect(loggedCommand).toBe(commandPath);+ expect(loggedEnv.HOME).toBe(root);+ expect(loggedEnv.PAPERCLIP_RESOLVED_COMMAND).toBe(commandPath);+ } finally {+ if (previousHome === undefined) delete process.env.HOME;+ else process.env.HOME = previousHome;+ if (previousPath === undefined) delete process.env.PATH;+ else process.env.PATH = previousPath;+ await fs.rm(root, { recursive: true, force: true });+ }+ });+it("uses a worktree-isolated CODEX_HOME while preserving shared auth and config", async () => {const root = await fs.mkdtemp(path.join(os.tmpdir(), "paperclip-codex-execute-"));const workspace = path.join(root, "workspace");diff --git a/server/src/adapters/process/execute.ts b/server/src/adapters/process/execute.tsindex 1d0cf9f674..ff2bf82e85 100644--- a/server/src/adapters/process/execute.ts+++ b/server/src/adapters/process/execute.ts@@ -5,7 +5,9 @@ import {asStringArray,parseObject,buildPaperclipEnv,- redactEnvForLogs,+ buildInvocationEnvForLogs,+ ensurePathInEnv,+ resolveCommandForLogs,runChildProcess,} from "../utils.js";@@ -21,6 +23,13 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExecfor (const [k, v] of Object.entries(envConfig)) {if (typeof v === "string") env[k] = v;}+ const runtimeEnv = ensurePathInEnv({ ...process.env, ...env });+ const resolvedCommand = await resolveCommandForLogs(command, cwd, runtimeEnv);+ const loggedEnv = buildInvocationEnvForLogs(env, {+ runtimeEnv,+ includeRuntimeKeys: ["HOME"],+ resolvedCommand,+ });const timeoutSec = asNumber(config.timeoutSec, 0);const graceSec = asNumber(config.graceSec, 15);@@ -28,10 +37,10 @@ export async function execute(ctx: AdapterExecutionContext): Promise<AdapterExecif (onMeta) {await onMeta({adapterType: "process",- command,+ command: resolvedCommand,cwd,commandArgs: args,- env: redactEnvForLogs(env),+ env: loggedEnv,});}diff --git a/server/src/adapters/utils.ts b/server/src/adapters/utils.tsindex cb4ec4b955..3c85852be8 100644--- a/server/src/adapters/utils.ts+++ b/server/src/adapters/utils.ts@@ -17,11 +17,13 @@ export {resolvePathValue,renderTemplate,redactEnvForLogs,+ buildInvocationEnvForLogs,buildPaperclipEnv,defaultPathForPlatform,ensurePathInEnv,ensureAbsoluteDirectory,ensureCommandResolvable,+ resolveCommandForLogs,} from "@paperclipai/adapter-utils/server-utils";// Re-export runChildProcess with the server's pino logger wired in.