mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-10-29 04:25:52 +01:00
## Thinking Path > - Paperclip lets operators assign tools and credentials to agents. > - Legacy Codex starts provider processes and builds a separate shell environment policy. > - Both ACP and CLI removed every variable whose name contained KEY, SECRET, or TOKEN. > - This also removed service credentials that the operator explicitly assigned, such as SLACK_BOT_TOKEN. > - This pull request uses the resolved configuration to admit assigned service secrets by name. > - Every Codex launch keeps a bounded shell allowlist, including launches without an agent identity. > - Assigned scripts can use their credentials without adding unassigned host secrets to shell tools. ## Linked Issues or Issue Description Related: #16255. That PR fixes project-level exclude patterns. This PR fixes the removal of explicitly assigned service secrets and the fallback to an inherited policy when no agent identity is present. **What happened?** A Codex task could not run a Slack posting script. SLACK_BOT_TOKEN was present in its resolved launch environment, but Paperclip removed its name from shell_environment_policy.include_only. A live removal check also showed that an identity-free launch without an explicit policy could inherit an unassigned host token. **Expected behavior** An explicitly assigned service credential reaches shell commands. Removing that binding removes its shell access on the next launch. Unassigned host credentials stay outside the allowlist. Codex login credentials and observability headers keep their separate provider paths. **Steps to reproduce** 1. Configure a Legacy Codex agent with a synthetic SLACK_BOT_TOKEN value. 2. Run a shell command that checks whether the variable exists without printing its value. 3. Before this fix, the variable is absent. Repeat through ACP and CLI. 4. Remove the binding and run a second turn. Check that neither the removed token nor an unassigned host token reaches the command. **Paperclip version or commit** Reproduced in the executor regressions before the fix on master at4dfcb4c9b8. The final change is rebased on25f2d05282. **Deployment mode** Source checkout. Local macOS arm64 provider acceptance with Codex CLI 0.160.0 and Codex ACP 1.6.2, gpt-5.6-sol, and an existing ChatGPT login. ## What Changed - Added one shared Codex shell-name policy for Legacy ACP and CLI execution. - Admit explicitly resolved service-secret bindings. Keep Codex login keys, observability credentials, and private runtime transport tokens outside that opt-in. - Reject glob-shaped environment names so one configured name cannot match other credentials. - Always emit the bounded policy. Do not fall back to host inheritance after a binding is removed. - Updated executor regressions, the identity contract, and the paired verification maps. ## Verification - Red before the fix: executor regressions failed because SLACK_BOT_TOKEN was absent in ACP and CLI, with and without agent identities. - Green: 267 tests passed across the two executor suites and the shared shell-policy suite. Coverage includes host/provider isolation, unresolved and removed bindings, glob names, identity delivery, and names-only metadata. - The complete Codex adapter source suite passed after the CI follow-up: 571 tests passed, 1 skipped across 31 files. Its typecheck also passed. - The first CI run caught four stale expectations in ACP config and SSH launch tests. Those now assert the bounded policy and the existing command/resume behavior. No production code changed in that follow-up. - Live CLI and ACP acceptance: run a Python presence check through each real adapter, remove the synthetic Slack binding, and run again. The assigned token was present only on the first turn. The unassigned host token and OpenAI API key were absent on both turns. CLI retained its session; ACP correctly invalidated its session after the configuration changed. Workspace proof files persisted. - An earlier live CLI check failed after binding removal because the no-policy fallback exposed the synthetic host token. The final change removes that fallback. Both live checks then passed. - Full pnpm -r typecheck and pnpm build passed. The changed packages were compiled again after the safety correction. - node scripts/check-maps.mjs and git diff --check passed. - The local pnpm test:run attempt reported failures in native warm-session tests and was interrupted. That full-suite result is not a pass; PR CI must establish the final repository-wide gate. One named native failure passed alone, and the complete native executor file then passed separately (774 tests). The original broad-run failure cause remains unconfirmed. - After rebase, one Gemini skill-root case timed out at five seconds while the broad run was active. The case passed alone, and the full focused set then passed again at the PR head (267 tests). The earlier timeout remains part of the verification record. - An initial broad adapter run failed because sandbox restrictions denied loopback listeners. Running the same suites with loopback access passed. ## Risks - Explicitly assigned service secrets now reach shell commands. This is the intended behavior change: assigning a credential authorizes the run to use it, and a model-directed command can read it. This is not a broker that hides assigned credentials from the model. Operators must assign only credentials and service permissions authorized for the run. Configuration and secret-access authorization remain with their existing owners. - Superagent initially flagged this intended assigned-credential exposure as a P2. The inline reply records the trust-model rationale and the documentation states it explicitly. The security scan on the final documented revision passed without any check override. - The launch policy contains names, not values. Log redaction remains in place. Provider login credentials and observability headers remain excluded from the service-secret opt-in. - Identity-free Codex runs now also receive a bounded policy. This removes reliance on the operator's inherited shell policy. - Existing explicit project exclude patterns retain their behavior; #16255 addresses that separate case. - The change has not been deployed to a shared instance. ## Model Used OpenAI GPT-6 through Codex, with reasoning, repository tools, and code execution. The exact served model ID and context-window size are not exposed in this session. ## Checklist - [x] I have included a thinking path that traces from project context to this change - [x] I have specified the model used (with version and capability details) - [x] I have checked ROADMAP.md and confirmed this PR does not duplicate planned core work - [x] I have searched GitHub for duplicate or related PRs and linked them above - [x] I have either (a) linked existing issues with Fixes / Closes / Refs OR (b) described the issue in-PR following the relevant issue template - [x] I have not referenced internal/instance-local Paperclip issues or links - [x] My branch name describes the change and contains no internal Paperclip ticket id or instance-derived details - [x] I have run the focused tests locally and they pass; the full-suite limitation is recorded above - [x] I have added or updated tests where applicable - [x] I have updated relevant documentation to reflect my changes - [x] I have considered and documented any risks above - [x] All Paperclip CI gates are green - [x] Greptile is 5/5 with no open P2s, recommendations, or follow-ups - [x] I will address all Greptile and reviewer comments before requesting merge --------- Co-authored-by: Paperclip <noreply@paperclip.ing>
344 lines
14 KiB
TypeScript
344 lines
14 KiB
TypeScript
import { lstat, mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
|
|
import os from "node:os";
|
|
import path from "node:path";
|
|
import { afterEach, describe, expect, it, vi } from "vitest";
|
|
|
|
import type { SandboxManagedRuntimeAsset } from "@paperclipai/adapter-utils/sandbox-managed-runtime";
|
|
|
|
// Captured Codex `home` asset descriptor + the sandbox `auth.json` fixture the
|
|
// mocked runtime hands back during teardown. Mutated per-test so a single
|
|
// harness drives every round-trip case through the REAL `execute()` wiring.
|
|
const captured: { assets: SandboxManagedRuntimeAsset[] } = { assets: [] };
|
|
const sandboxAuthFixture: { bytes: Buffer } = { bytes: Buffer.from("{}") };
|
|
const REMOTE_RUNTIME_ROOT = "/remote/workspace/.paperclip-runtime/codex";
|
|
|
|
const {
|
|
runChildProcess,
|
|
ensureCommandResolvable,
|
|
resolveCommandForLogs,
|
|
prepareAdapterExecutionTargetRuntime,
|
|
startAdapterExecutionTargetPaperclipBridge,
|
|
} = vi.hoisted(() => ({
|
|
runChildProcess: vi.fn(async () => ({
|
|
exitCode: 0,
|
|
signal: null,
|
|
timedOut: false,
|
|
stdout: "",
|
|
stderr: "",
|
|
pid: 321,
|
|
startedAt: new Date().toISOString(),
|
|
})),
|
|
ensureCommandResolvable: vi.fn(async () => undefined),
|
|
resolveCommandForLogs: vi.fn(async () => "/usr/bin/codex"),
|
|
prepareAdapterExecutionTargetRuntime: vi.fn(),
|
|
startAdapterExecutionTargetPaperclipBridge: vi.fn(async () => null),
|
|
}));
|
|
|
|
vi.mock("@paperclipai/adapter-utils/server-utils", async () => {
|
|
const actual = await vi.importActual<typeof import("@paperclipai/adapter-utils/server-utils")>(
|
|
"@paperclipai/adapter-utils/server-utils",
|
|
);
|
|
return {
|
|
...actual,
|
|
ensureCommandResolvable,
|
|
resolveCommandForLogs,
|
|
runChildProcess,
|
|
};
|
|
});
|
|
|
|
vi.mock("@paperclipai/adapter-utils/execution-target", async () => {
|
|
const actual = await vi.importActual<typeof import("@paperclipai/adapter-utils/execution-target")>(
|
|
"@paperclipai/adapter-utils/execution-target",
|
|
);
|
|
return {
|
|
...actual,
|
|
prepareAdapterExecutionTargetRuntime,
|
|
startAdapterExecutionTargetPaperclipBridge,
|
|
};
|
|
});
|
|
|
|
import { execute } from "./execute.js";
|
|
|
|
// Mirror the sandbox core's restore closure: capture the assets `execute()`
|
|
// declares, then during teardown invoke each asset's `restore` with an injected
|
|
// `readFile` (returns the sandbox fixture) and the remote asset dir. This drives
|
|
// the exact `restore` contribution the Codex adapter wires in production without
|
|
// needing a live sandbox.
|
|
prepareAdapterExecutionTargetRuntime.mockImplementation(async (input: { assets?: SandboxManagedRuntimeAsset[] }) => {
|
|
captured.assets = input.assets ?? [];
|
|
return {
|
|
target: { kind: "remote", transport: "ssh" },
|
|
workspaceRemoteDir: "/remote/workspace",
|
|
runtimeRootDir: REMOTE_RUNTIME_ROOT,
|
|
assetDirs: { home: `${REMOTE_RUNTIME_ROOT}/home` },
|
|
restoreWorkspace: async () => {
|
|
for (const asset of captured.assets) {
|
|
if (!asset.restore) continue;
|
|
await asset.restore({
|
|
assetDir: `${REMOTE_RUNTIME_ROOT}/home`,
|
|
readFile: async () => sandboxAuthFixture.bytes,
|
|
});
|
|
}
|
|
},
|
|
};
|
|
});
|
|
|
|
describe("codex execute — outbound auth copy-back restore contribution", () => {
|
|
const cleanupDirs: string[] = [];
|
|
let savedCodexHomeEnv: string | undefined;
|
|
|
|
afterEach(async () => {
|
|
vi.clearAllMocks();
|
|
vi.unstubAllEnvs();
|
|
if (savedCodexHomeEnv === undefined) {
|
|
delete process.env.CODEX_HOME;
|
|
} else {
|
|
process.env.CODEX_HOME = savedCodexHomeEnv;
|
|
}
|
|
while (cleanupDirs.length > 0) {
|
|
const dir = cleanupDirs.pop();
|
|
if (!dir) continue;
|
|
await rm(dir, { recursive: true, force: true }).catch(() => undefined);
|
|
}
|
|
});
|
|
|
|
function subscriptionAuth(input: { accountId: string; lastRefresh?: string; marker: string }): string {
|
|
return JSON.stringify(
|
|
{
|
|
tokens: {
|
|
id_token: `id-token-${input.marker}`,
|
|
access_token: `access-token-${input.marker}`,
|
|
refresh_token: `refresh-token-${input.marker}`,
|
|
account_id: input.accountId,
|
|
},
|
|
...(input.lastRefresh ? { last_refresh: input.lastRefresh } : {}),
|
|
},
|
|
null,
|
|
2,
|
|
);
|
|
}
|
|
|
|
async function runTeardown(input: { sandboxAuth: string; hostAuth: string; onProviderStopped?: () => Promise<void>; withIdentity?: boolean; env?: Record<string, string> }) {
|
|
const rootDir = await mkdtemp(
|
|
path.join(os.tmpdir(), "paperclip-codex-copyback-e2e-"),
|
|
);
|
|
cleanupDirs.push(rootDir);
|
|
const workspaceDir = path.join(rootDir, "workspace");
|
|
// The shared host home is what `resolveSharedCodexHomeDir` returns
|
|
// (process.env.CODEX_HOME) — the copy-back target. Point it at a tmp dir so
|
|
// the round-trip never touches the real host credential.
|
|
const sharedHostHome = path.join(rootDir, "shared-codex-home");
|
|
await mkdir(workspaceDir, { recursive: true });
|
|
await mkdir(sharedHostHome, { recursive: true });
|
|
const hostAuthPath = path.join(sharedHostHome, "auth.json");
|
|
await writeFile(hostAuthPath, input.hostAuth, { mode: 0o600 });
|
|
|
|
savedCodexHomeEnv = process.env.CODEX_HOME;
|
|
process.env.CODEX_HOME = sharedHostHome;
|
|
sandboxAuthFixture.bytes = Buffer.from(input.sandboxAuth, "utf8");
|
|
|
|
const commandArgs: string[] = [];
|
|
const executionResult = await execute({
|
|
runId: "run-copyback-e2e",
|
|
...(input.withIdentity ? {
|
|
authToken: "assigned-run-token",
|
|
agentIdentity: { keyId: "sha256:test", publicKeyPem: "public", privateKeyPem: "private" },
|
|
} : {}),
|
|
onMeta: async meta => { commandArgs.push(...(meta.commandArgs ?? [])); },
|
|
onProviderStopped: input.onProviderStopped,
|
|
agent: {
|
|
id: "agent-1",
|
|
companyId: "company-1",
|
|
name: "CodexCoder",
|
|
adapterType: "codex_local",
|
|
adapterConfig: {},
|
|
},
|
|
runtime: { sessionId: null, sessionParams: null, sessionDisplayId: null, taskKey: null },
|
|
config: {
|
|
command: "codex",
|
|
engine: "cli",
|
|
// External CODEX_HOME (outside the managed company tree) so no managed
|
|
// seeding rewrites auth.json before teardown; equals the shared host home.
|
|
env: { CODEX_HOME: sharedHostHome, ...input.env },
|
|
},
|
|
context: {
|
|
paperclipWorkspace: {
|
|
cwd: workspaceDir,
|
|
source: "project_primary",
|
|
},
|
|
},
|
|
executionTransport: {
|
|
remoteExecution: {
|
|
host: "127.0.0.1",
|
|
port: 2222,
|
|
username: "fixture",
|
|
remoteWorkspacePath: "/remote/workspace",
|
|
remoteCwd: "/remote/workspace",
|
|
privateKey: "PRIVATE KEY",
|
|
knownHosts: "[127.0.0.1]:2222 ssh-ed25519 AAAA",
|
|
strictHostKeyChecking: true,
|
|
},
|
|
},
|
|
onLog: async () => {},
|
|
});
|
|
|
|
return {
|
|
commandArgs,
|
|
finalHostAuth: await readFile(hostAuthPath, "utf8"),
|
|
finalHostMode: (await lstat(hostAuthPath)).mode & 0o777,
|
|
executionResult,
|
|
};
|
|
}
|
|
|
|
it.each([true, false])("delivers configured service tokens to CLI shells while isolating host and provider credentials (identity: %s)", async (withIdentity) => {
|
|
vi.stubEnv("DATABASE_URL", "postgres://operator:host-password@host/private");
|
|
vi.stubEnv("HOST_DATABASE_PASSWORD", "host-password");
|
|
const { commandArgs } = await runTeardown({ sandboxAuth: "{}", hostAuth: "{}", withIdentity,
|
|
env: { SLACK_BOT_TOKEN: "assigned-tool-token", OPENAI_API_KEY: "provider-key-canary" },
|
|
});
|
|
const policy = commandArgs.find(arg => arg.startsWith("shell_environment_policy.include_only="));
|
|
const keys = policy ? JSON.parse(policy.slice(policy.indexOf("=") + 1)) : [];
|
|
expect(keys).toContain("SLACK_BOT_TOKEN");
|
|
if (withIdentity) expect(keys).toEqual(expect.arrayContaining([
|
|
"PAPERCLIP_API_KEY", "PAPERCLIP_AGENT_PRIVATE_KEY",
|
|
]));
|
|
expect(keys).not.toContain("OPENAI_API_KEY");
|
|
expect(keys).not.toContain("DATABASE_URL");
|
|
expect(keys).not.toContain("HOST_DATABASE_PASSWORD");
|
|
expect(commandArgs.join(" ")).not.toContain("assigned-run-token");
|
|
expect(commandArgs.join(" ")).not.toContain("assigned-tool-token");
|
|
});
|
|
|
|
it("collects stopped-provider instruction edits before a throwing remote restore", async () => {
|
|
const order: string[] = [];
|
|
prepareAdapterExecutionTargetRuntime.mockImplementationOnce(async () => ({
|
|
target: { kind: "remote", transport: "ssh" }, workspaceRemoteDir: "/remote/workspace",
|
|
runtimeRootDir: REMOTE_RUNTIME_ROOT, assetDirs: { home: `${REMOTE_RUNTIME_ROOT}/home` },
|
|
restoreWorkspace: async () => { order.push("restore"); throw new Error("restore failed"); },
|
|
}));
|
|
await expect(runTeardown({ sandboxAuth: "{}", hostAuth: "{}", onProviderStopped: async () => { order.push("collect"); } })).rejects.toThrow("restore failed");
|
|
expect(order).toEqual(["collect", "restore"]);
|
|
});
|
|
|
|
it("collects after a failed provider exit before restoring its workspace", async () => {
|
|
runChildProcess.mockResolvedValueOnce({ exitCode: 1, signal: null, timedOut: false, stdout: "", stderr: "provider failed", pid: 321, startedAt: new Date().toISOString() });
|
|
const collected = vi.fn(async () => {});
|
|
await runTeardown({ sandboxAuth: "{}", hostAuth: "{}", onProviderStopped: collected });
|
|
expect(collected).toHaveBeenCalledOnce();
|
|
});
|
|
|
|
it("stops the bridge and restores the workspace when instruction collection rejects", async () => {
|
|
const order: string[] = [];
|
|
startAdapterExecutionTargetPaperclipBridge.mockResolvedValueOnce({
|
|
env: {}, stop: async () => { order.push("bridge-stop"); },
|
|
} as never);
|
|
prepareAdapterExecutionTargetRuntime.mockImplementationOnce(async () => ({
|
|
target: { kind: "remote", transport: "ssh" }, workspaceRemoteDir: "/remote/workspace",
|
|
runtimeRootDir: REMOTE_RUNTIME_ROOT, assetDirs: { home: `${REMOTE_RUNTIME_ROOT}/home` },
|
|
restoreWorkspace: async () => { order.push("restore"); },
|
|
}));
|
|
await expect(runTeardown({ sandboxAuth: "{}", hostAuth: "{}", onProviderStopped: async () => {
|
|
order.push("collect");
|
|
throw new Error("instruction collection failed");
|
|
} })).rejects.toThrow("instruction collection failed");
|
|
expect(order).toEqual(["collect", "bridge-stop", "restore"]);
|
|
});
|
|
|
|
it("declares a Codex `home` asset carrying both inbound provision and outbound restore contributions", async () => {
|
|
await runTeardown({
|
|
sandboxAuth: subscriptionAuth({ accountId: "acct", lastRefresh: "2026-07-09T01:00:00Z", marker: "s" }),
|
|
hostAuth: subscriptionAuth({ accountId: "acct", lastRefresh: "2026-07-09T02:00:00Z", marker: "h" }),
|
|
});
|
|
|
|
const homeAsset = captured.assets.find((asset) => asset.key === "home");
|
|
expect(homeAsset).toBeDefined();
|
|
expect(homeAsset?.provision).toBeTruthy();
|
|
expect(typeof homeAsset?.restore).toBe("function");
|
|
});
|
|
|
|
it("round-trips a strictly-newer same-identity sandbox auth.json to the shared host at 0600 on teardown", async () => {
|
|
const sandboxAuth = subscriptionAuth({
|
|
accountId: "acct-same",
|
|
lastRefresh: "2026-07-09T02:00:00Z",
|
|
marker: "sandbox-newer",
|
|
});
|
|
const hostAuth = subscriptionAuth({
|
|
accountId: "acct-same",
|
|
lastRefresh: "2026-07-09T01:00:00Z",
|
|
marker: "host-older",
|
|
});
|
|
|
|
const result = await runTeardown({ sandboxAuth, hostAuth });
|
|
|
|
expect(result.finalHostAuth).toBe(sandboxAuth);
|
|
expect(result.finalHostMode).toBe(0o600);
|
|
});
|
|
|
|
it("keeps the host auth.json when the sandbox copy is a tie or older on teardown", async () => {
|
|
const cases = [
|
|
{
|
|
name: "tie",
|
|
sandboxAuth: subscriptionAuth({ accountId: "acct-same", lastRefresh: "2026-07-09T02:00:00Z", marker: "s-tie" }),
|
|
hostAuth: subscriptionAuth({ accountId: "acct-same", lastRefresh: "2026-07-09T02:00:00Z", marker: "h-tie" }),
|
|
},
|
|
{
|
|
name: "older",
|
|
sandboxAuth: subscriptionAuth({ accountId: "acct-same", lastRefresh: "2026-07-09T01:00:00Z", marker: "s-old" }),
|
|
hostAuth: subscriptionAuth({ accountId: "acct-same", lastRefresh: "2026-07-09T02:00:00Z", marker: "h-new" }),
|
|
},
|
|
];
|
|
|
|
for (const entry of cases) {
|
|
const result = await runTeardown({ sandboxAuth: entry.sandboxAuth, hostAuth: entry.hostAuth });
|
|
expect(result.finalHostAuth, entry.name).toBe(entry.hostAuth);
|
|
expect(result.finalHostMode, entry.name).toBe(0o600);
|
|
}
|
|
});
|
|
|
|
it("surfaces workspace restore failure after successful provider execution", async () => {
|
|
prepareAdapterExecutionTargetRuntime.mockResolvedValueOnce({
|
|
target: { kind: "remote", transport: "ssh" },
|
|
workspaceRemoteDir: "/remote/workspace",
|
|
runtimeRootDir: REMOTE_RUNTIME_ROOT,
|
|
assetDirs: { home: `${REMOTE_RUNTIME_ROOT}/home` },
|
|
restoreWorkspace: async () => {
|
|
throw new Error("workspace copy-back failed");
|
|
},
|
|
});
|
|
|
|
await expect(
|
|
runTeardown({
|
|
sandboxAuth: subscriptionAuth({ accountId: "acct", marker: "sandbox" }),
|
|
hostAuth: subscriptionAuth({ accountId: "acct", marker: "host" }),
|
|
}),
|
|
).rejects.toThrow("workspace copy-back failed");
|
|
});
|
|
|
|
it("preserves a provider failure when workspace restore also fails", async () => {
|
|
runChildProcess.mockResolvedValueOnce({
|
|
exitCode: 1,
|
|
signal: null,
|
|
timedOut: false,
|
|
stdout: "",
|
|
stderr: "provider failed first",
|
|
pid: 321,
|
|
startedAt: new Date().toISOString(),
|
|
});
|
|
prepareAdapterExecutionTargetRuntime.mockResolvedValueOnce({
|
|
target: { kind: "remote", transport: "ssh" },
|
|
workspaceRemoteDir: "/remote/workspace",
|
|
runtimeRootDir: REMOTE_RUNTIME_ROOT,
|
|
assetDirs: { home: `${REMOTE_RUNTIME_ROOT}/home` },
|
|
restoreWorkspace: async () => {
|
|
throw new Error("workspace copy-back failed second");
|
|
},
|
|
});
|
|
|
|
const result = await runTeardown({
|
|
sandboxAuth: subscriptionAuth({ accountId: "acct", marker: "sandbox" }),
|
|
hostAuth: subscriptionAuth({ accountId: "acct", marker: "host" }),
|
|
});
|
|
expect(result.executionResult.errorMessage).toBe("provider failed first");
|
|
});
|
|
});
|