@paperclipai/adapter-utils 2026.1002.0-canary.21 → 2026.1002.0-canary.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +0 -13
- package/dist/acpx-engine/execute.d.ts.map +1 -1
- package/dist/acpx-engine/execute.js +6 -28
- package/dist/acpx-engine/execute.js.map +1 -1
- package/dist/acpx-engine/execute.test.js +0 -39
- package/dist/acpx-engine/execute.test.js.map +1 -1
- package/dist/acpx-engine/session-codec.d.ts.map +1 -1
- package/dist/acpx-engine/session-codec.js +0 -1
- package/dist/acpx-engine/session-codec.js.map +1 -1
- package/dist/acpx-engine/terminal-session-failure.d.ts +0 -6
- package/dist/acpx-engine/terminal-session-failure.d.ts.map +1 -1
- package/dist/acpx-engine/terminal-session-failure.js +0 -14
- package/dist/acpx-engine/terminal-session-failure.js.map +1 -1
- package/dist/acpx-engine/terminal-session-failure.test.js +1 -21
- package/dist/acpx-engine/terminal-session-failure.test.js.map +1 -1
- package/dist/command-redaction.d.ts +0 -2
- package/dist/command-redaction.d.ts.map +1 -1
- package/dist/command-redaction.js +10 -20
- package/dist/command-redaction.js.map +1 -1
- package/dist/command-redaction.test.js +1 -20
- package/dist/command-redaction.test.js.map +1 -1
- package/dist/directory-merge-lock.test.js +39 -23
- package/dist/directory-merge-lock.test.js.map +1 -1
- package/dist/execution-target-sandbox.test.js +6 -48
- package/dist/execution-target-sandbox.test.js.map +1 -1
- package/dist/execution-target-stdin-race.test.js +0 -4
- package/dist/execution-target-stdin-race.test.js.map +1 -1
- package/dist/execution-target.d.ts.map +1 -1
- package/dist/execution-target.js +10 -6
- package/dist/execution-target.js.map +1 -1
- package/dist/sandbox-callback-bridge.d.ts +0 -2
- package/dist/sandbox-callback-bridge.d.ts.map +1 -1
- package/dist/sandbox-callback-bridge.js +3 -12
- package/dist/sandbox-callback-bridge.js.map +1 -1
- package/dist/sandbox-callback-bridge.test.js +0 -100
- package/dist/sandbox-callback-bridge.test.js.map +1 -1
- package/dist/server-utils.d.ts +1 -4
- package/dist/server-utils.d.ts.map +1 -1
- package/dist/server-utils.js +1 -13
- package/dist/server-utils.js.map +1 -1
- package/dist/server-utils.test.js +1 -17
- package/dist/server-utils.test.js.map +1 -1
- package/dist/session-compaction.d.ts.map +1 -1
- package/dist/session-compaction.js +0 -6
- package/dist/session-compaction.js.map +1 -1
- package/dist/types.d.ts +1 -5
- package/dist/types.d.ts.map +1 -1
- package/dist/workspace-restore-merge.d.ts +1 -1
- package/dist/workspace-restore-merge.d.ts.map +1 -1
- package/dist/workspace-restore-merge.js +4 -7
- package/dist/workspace-restore-merge.js.map +1 -1
- package/node_modules/@agentclientprotocol/sdk/README.md +0 -7
- package/node_modules/@agentclientprotocol/sdk/dist/acp.d.ts +1 -15
- package/node_modules/@agentclientprotocol/sdk/dist/acp.js +1 -15
- package/node_modules/@agentclientprotocol/sdk/dist/acp.js.map +1 -1
- package/node_modules/@agentclientprotocol/sdk/dist/protocol-router.d.ts +2 -9
- package/node_modules/@agentclientprotocol/sdk/dist/protocol-router.js +1 -6
- package/node_modules/@agentclientprotocol/sdk/dist/protocol-router.js.map +1 -1
- package/node_modules/@agentclientprotocol/sdk/dist/protocol-router.test.js +1 -58
- package/node_modules/@agentclientprotocol/sdk/dist/protocol-router.test.js.map +1 -1
- package/node_modules/@agentclientprotocol/sdk/dist/v2/acp.d.ts +1 -15
- package/node_modules/@agentclientprotocol/sdk/dist/v2/acp.js +13 -38
- package/node_modules/@agentclientprotocol/sdk/dist/v2/acp.js.map +1 -1
- package/node_modules/@agentclientprotocol/sdk/dist/v2/acp.test.js +0 -95
- package/node_modules/@agentclientprotocol/sdk/dist/v2/acp.test.js.map +1 -1
- package/node_modules/@agentclientprotocol/sdk/dist/v2/schema/guards.gen.d.ts +27 -84
- package/node_modules/@agentclientprotocol/sdk/dist/v2/schema/guards.gen.js.map +1 -1
- package/node_modules/@agentclientprotocol/sdk/dist/v2/schema/types.gen.d.ts +38 -289
- package/node_modules/@agentclientprotocol/sdk/package.json +1 -1
- package/node_modules/tar-stream/package.json +7 -7
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -9,19 +9,6 @@ For the adapter-author guide see
|
|
|
9
9
|
[`docs/adapters/creating-an-adapter.md`](../../docs/adapters/creating-an-adapter.md)
|
|
10
10
|
and the in-repo notes at [`packages/adapters/AUTHORING.md`](../adapters/AUTHORING.md).
|
|
11
11
|
|
|
12
|
-
## Sandbox bridge deadlines
|
|
13
|
-
|
|
14
|
-
Command-managed bridge control operations (queue reads, input delivery, setup,
|
|
15
|
-
and cleanup) have a host-enforced deadline of at most 30 seconds per shell
|
|
16
|
-
command. A shorter configured timeout still applies. These operations cannot
|
|
17
|
-
inherit the agent run's hours-long lifetime or wait forever on a provider that
|
|
18
|
-
ignores its timeout. Long-lived agent session commands keep their own limits.
|
|
19
|
-
|
|
20
|
-
A control timeout reports a transport failure. It does not prove that the
|
|
21
|
-
remote command stopped and does not replay an uncertain write. The process
|
|
22
|
-
session closes failed input delivery and uses its existing shutdown path;
|
|
23
|
-
normal execution settlement must still verify termination.
|
|
24
|
-
|
|
25
12
|
## No-remote-git contract
|
|
26
13
|
|
|
27
14
|
The local execution-workspace cwd is the only persistence boundary across
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../src/acpx-engine/execute.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EACV,kBAAkB,EAClB,uBAAuB,EACvB,sBAAsB,EACtB,YAAY,EACb,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAcL,KAAK,sBAAsB,EAI3B,KAAK,0BAA0B,EAC/B,KAAK,qCAAqC,EAC1C,KAAK,gCAAgC,EAEtC,MAAM,6CAA6C,CAAC;AAIrD,OAAO,
|
|
1
|
+
{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../src/acpx-engine/execute.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,9 +10,9 @@ import { fileURLToPath } from "node:url";
|
|
|
10
10
|
import { adapterExecutionTargetSessionIdentity, describeAdapterExecutionTarget, adapterExecutionTargetDuplexObservabilityRecorder, adapterExecutionTargetEnablesSandboxDuplexBridge, formatAdapterExecutionTimeoutErrorMessage, formatAdapterExecutionTimeoutStartLogLine, prepareAdapterExecutionTargetRuntime, readAdapterExecutionTarget, resolveAdapterExecutionTargetTimeout, resolveReferencedSourceIgnore, runAdapterExecutionTargetShellCommand, startAdapterExecutionTargetPaperclipBridge, startAdapterExecutionTargetProcessSessionBridge, } from "@paperclipai/adapter-utils/execution-target";
|
|
11
11
|
import { captureLocalProcess, capturedProcessExited, killCapturedLocalProcess } from "./local-process-control.js";
|
|
12
12
|
import { DUPLEX_CHANNEL_LOST_ERROR_CODE } from "../bridge-transport-contract.js";
|
|
13
|
-
import {
|
|
13
|
+
import { formatTerminalSessionFailure, sanitizeTerminalSessionFailure, } from "./terminal-session-failure.js";
|
|
14
14
|
import { classifyWorkspaceRestoreFailure, describeWorkspaceRestoreFailure, } from "../workspace-restore-merge.js";
|
|
15
|
-
import { DEFAULT_PAPERCLIP_AGENT_PROMPT_TEMPLATE, DEFAULT_PAPERCLIP_CONVERSATION_PROMPT_TEMPLATE, applyPaperclipWorkspaceEnv, asNumber, asString, buildInvocationEnvForLogs, buildPaperclipEnv, ensureAbsoluteDirectory, ensurePathInEnv, ensurePaperclipSkillSymlink, isForbiddenConfigEnvKey, isPaperclipExternalChatTurn, isPaperclipRuntimeEnvKey, joinPromptSections, materializePaperclipSkillCopy, parseObject, isPaperclipSkillSourceMissing, readPaperclipRuntimeSkillEntries, readPaperclipIssueWorkModeFromContext, renderTemplate, resolvePaperclipInstanceRootForAdapter,
|
|
15
|
+
import { DEFAULT_PAPERCLIP_AGENT_PROMPT_TEMPLATE, DEFAULT_PAPERCLIP_CONVERSATION_PROMPT_TEMPLATE, applyPaperclipWorkspaceEnv, asNumber, asString, buildInvocationEnvForLogs, buildPaperclipEnv, ensureAbsoluteDirectory, ensurePathInEnv, ensurePaperclipSkillSymlink, isForbiddenConfigEnvKey, isPaperclipExternalChatTurn, isPaperclipRuntimeEnvKey, joinPromptSections, materializePaperclipSkillCopy, parseObject, isPaperclipSkillSourceMissing, readPaperclipRuntimeSkillEntries, readPaperclipIssueWorkModeFromContext, renderTemplate, resolvePaperclipInstanceRootForAdapter, selectPaperclipPromptSections, resolveLegacyPaperclipDesiredSkillNames, removeMaintainerOnlySkillSymlinks, rewriteWorkspaceCwdEnvVarsForExecution, shapePaperclipWorkspaceEnvForExecution, } from "@paperclipai/adapter-utils/server-utils";
|
|
16
16
|
import { shellQuote } from "@paperclipai/adapter-utils/ssh";
|
|
17
17
|
import { createAcpRuntime, createAgentRegistry, createRuntimeStore, isAcpRuntimeError, } from "acpx/runtime";
|
|
18
18
|
import { ACPX_DUPLEX_LOSS_CANCEL_DEADLINE_MS, ACPX_HANDSHAKE_TIMEOUT_MS, ACPX_HANDSHAKE_TRANSPORT_POLL_MS, DEFAULT_ACP_ENGINE_AGENT, DEFAULT_ACP_ENGINE_MODE, DEFAULT_ACP_ENGINE_NON_INTERACTIVE_PERMISSIONS, DEFAULT_ACP_ENGINE_PERMISSION_MODE, DEFAULT_ACP_ENGINE_TIMEOUT_SEC, DEFAULT_ACP_ENGINE_WARM_HANDLE_IDLE_MS, } from "./constants.js";
|
|
@@ -908,7 +908,6 @@ function buildSessionParams(input) {
|
|
|
908
908
|
mode: prepared.mode,
|
|
909
909
|
stateDir: prepared.stateDir,
|
|
910
910
|
configFingerprint: prepared.fingerprint,
|
|
911
|
-
mcpFingerprint: shortHash(prepared.mcpIdentity),
|
|
912
911
|
...(prepared.requestedModel ? { model: prepared.requestedModel } : {}),
|
|
913
912
|
...(prepared.requestedThinkingEffort ? { thinkingEffort: prepared.requestedThinkingEffort } : {}),
|
|
914
913
|
...(prepared.fastMode ? { fastMode: true } : {}),
|
|
@@ -1454,9 +1453,7 @@ async function buildRuntime(input) {
|
|
|
1454
1453
|
defaultMode: paperclipClaudeSettings.defaultMode,
|
|
1455
1454
|
}
|
|
1456
1455
|
: null,
|
|
1457
|
-
|
|
1458
|
-
// on session/load. Keep their conversation identity independent of tools.
|
|
1459
|
-
mcpServers: ["claude", "codex", "grok", "gemini", "kimi"].includes(acpxAgent) ? [] : mcpIdentity,
|
|
1456
|
+
mcpServers: mcpIdentity,
|
|
1460
1457
|
secretManifestHash: shortHash(secretManifest),
|
|
1461
1458
|
// Fold the resolved adapter env (all applied user-configured values —
|
|
1462
1459
|
// plain, secret_ref, and stable PAPERCLIP_* config such as an explicit
|
|
@@ -2156,8 +2153,7 @@ async function buildPrompt(ctx, resumedSession, env) {
|
|
|
2156
2153
|
const renderedBootstrapPrompt = !resumedSession && bootstrapPromptTemplate.trim().length > 0
|
|
2157
2154
|
? renderTemplate(bootstrapPromptTemplate, templateData).trim()
|
|
2158
2155
|
: "";
|
|
2159
|
-
|
|
2160
|
-
const { taskContextNote, wakePrompt } = selectPaperclipPromptSections(context, { resumedSession, includeCommunicationGuidance: false });
|
|
2156
|
+
const { taskContextNote, wakePrompt } = selectPaperclipPromptSections(context, { resumedSession });
|
|
2161
2157
|
const externalChatTurn = isPaperclipExternalChatTurn(context.paperclipWake);
|
|
2162
2158
|
const shouldUseResumeDeltaPrompt = resumedSession && wakePrompt.length > 0;
|
|
2163
2159
|
const promptInstructionsPrefix = shouldUseResumeDeltaPrompt ? "" : instructionsPrefix;
|
|
@@ -2170,7 +2166,6 @@ async function buildPrompt(ctx, resumedSession, env) {
|
|
|
2170
2166
|
const prompt = joinPromptSections([
|
|
2171
2167
|
promptInstructionsPrefix,
|
|
2172
2168
|
renderedBootstrapPrompt,
|
|
2173
|
-
selectInitialCommunicationGuidance(context, { resumedSession }),
|
|
2174
2169
|
wakePrompt,
|
|
2175
2170
|
sessionHandoffNote,
|
|
2176
2171
|
taskContextNote,
|
|
@@ -3216,14 +3211,7 @@ export function createAcpxEngineExecutor(deps = {}) {
|
|
|
3216
3211
|
// same session still sees it. The borrow clears the entry's idle timer, so
|
|
3217
3212
|
// the reused runtime cannot expire under its own timer while this run uses
|
|
3218
3213
|
// it (today's `clearWarmHandleTimer(cached)` after the reuse decision).
|
|
3219
|
-
|
|
3220
|
-
if (cached && (ctx.context.refreshTools === true
|
|
3221
|
-
|| asString(previousParams.mcpFingerprint, "") !== shortHash(prepared.mcpIdentity)
|
|
3222
|
-
// MCP bearer credentials are run-scoped, even for an unchanged catalog.
|
|
3223
|
-
|| prepared.mcpServers.length > 0)) {
|
|
3224
|
-
await hostStore.discard(prepared.sessionKey);
|
|
3225
|
-
cached = undefined;
|
|
3226
|
-
}
|
|
3214
|
+
const cached = canResume ? hostStore.borrow(prepared.sessionKey) : undefined;
|
|
3227
3215
|
childStderrState = cached?.childStderrState ?? { logPath: null, pendingLiveLine: "" };
|
|
3228
3216
|
processIdentitySink = cached?.processIdentitySink ?? {
|
|
3229
3217
|
current: ctx.onSpawn,
|
|
@@ -3780,9 +3768,8 @@ export function createAcpxEngineExecutor(deps = {}) {
|
|
|
3780
3768
|
// Diagnostics are retained even when an adapter has no recovery
|
|
3781
3769
|
// classifier. Redact before bounding so partial secrets cannot leak.
|
|
3782
3770
|
onTerminalSessionFailure: (failure) => {
|
|
3783
|
-
terminalFailureClassification = classifyToolDefinitionFailure(failure)
|
|
3784
|
-
?? deps.classifyTerminalSessionFailure?.(failure, new Date(now())) ?? null;
|
|
3785
3771
|
terminalSessionFailure = sanitizeTerminalSessionFailure(failure, prepared.env, ctx.authToken, parseObject(ctx.config.env));
|
|
3772
|
+
terminalFailureClassification = deps.classifyTerminalSessionFailure?.(failure, new Date(now())) ?? null;
|
|
3786
3773
|
},
|
|
3787
3774
|
});
|
|
3788
3775
|
activeTurn = turn;
|
|
@@ -4468,15 +4455,6 @@ export function createAcpxEngineExecutor(deps = {}) {
|
|
|
4468
4455
|
} },
|
|
4469
4456
|
};
|
|
4470
4457
|
}
|
|
4471
|
-
// Preserve the policy resolved for this execution target. The server
|
|
4472
|
-
// cannot reconstruct sandbox defaults from the stored agent config.
|
|
4473
|
-
capturedResult = {
|
|
4474
|
-
...capturedResult,
|
|
4475
|
-
resultJson: {
|
|
4476
|
-
...capturedResult.resultJson,
|
|
4477
|
-
adapterExecutionTimeout: { ...prepared.timeoutResolution },
|
|
4478
|
-
},
|
|
4479
|
-
};
|
|
4480
4458
|
// The sync-back settlement step runs before this reproduces the result
|
|
4481
4459
|
// (settlement precedes reproduction), so a failed workspace restore is
|
|
4482
4460
|
// already recorded by the time we get here. Merge it into `resultJson`
|