@tickernelz/wardmote-adapter-omp-local 2026.1108.2 → 2026.1111.0
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/dist/metadata.d.ts +1 -1
- package/dist/metadata.d.ts.map +1 -1
- package/dist/metadata.js +11 -11
- package/dist/server/config.js +25 -25
- package/dist/server/config.js.map +1 -1
- package/dist/server/execute.cwd.test.js +6 -6
- package/dist/server/execute.cwd.test.js.map +1 -1
- package/dist/server/execute.d.ts +1 -1
- package/dist/server/execute.d.ts.map +1 -1
- package/dist/server/execute.js +97 -97
- package/dist/server/execute.js.map +1 -1
- package/dist/server/execute.mcp.test.js +164 -84
- package/dist/server/execute.mcp.test.js.map +1 -1
- package/dist/server/execute.model-override.test.js +1 -1
- package/dist/server/execute.model-override.test.js.map +1 -1
- package/dist/server/execute.provider-stop.test.js +1 -1
- package/dist/server/execute.provider-stop.test.js.map +1 -1
- package/dist/server/execute.python-env.remote.test.js +9 -9
- package/dist/server/execute.python-env.remote.test.js.map +1 -1
- package/dist/server/execute.toggles.test.js +1 -1
- package/dist/server/execute.toggles.test.js.map +1 -1
- package/dist/server/execute.transport.test.js +2 -2
- package/dist/server/execute.transport.test.js.map +1 -1
- package/dist/server/execute.usage-checkpoint.test.js +1 -1
- package/dist/server/execute.usage-checkpoint.test.js.map +1 -1
- package/dist/server/failure.d.ts +0 -1
- package/dist/server/failure.d.ts.map +1 -1
- package/dist/server/failure.js +0 -1
- package/dist/server/failure.js.map +1 -1
- package/dist/server/model-fallback.d.ts +0 -1
- package/dist/server/model-fallback.d.ts.map +1 -1
- package/dist/server/model-fallback.js +5 -1
- package/dist/server/model-fallback.js.map +1 -1
- package/dist/server/model-fallback.test.js +24 -0
- package/dist/server/model-fallback.test.js.map +1 -1
- package/dist/server/models.js +4 -4
- package/dist/server/models.js.map +1 -1
- package/dist/server/profile.js +2 -2
- package/dist/server/profile.js.map +1 -1
- package/dist/server/progress.d.ts +0 -1
- package/dist/server/progress.d.ts.map +1 -1
- package/dist/server/progress.js +0 -1
- package/dist/server/progress.js.map +1 -1
- package/dist/server/providers.d.ts +60 -0
- package/dist/server/providers.d.ts.map +1 -0
- package/dist/server/providers.js +571 -0
- package/dist/server/providers.js.map +1 -0
- package/dist/server/providers.test.d.ts +2 -0
- package/dist/server/providers.test.d.ts.map +1 -0
- package/dist/server/providers.test.js +145 -0
- package/dist/server/providers.test.js.map +1 -0
- package/dist/server/python-env.js +6 -6
- package/dist/server/python-env.js.map +1 -1
- package/dist/server/python-env.test.js +18 -18
- package/dist/server/python-env.test.js.map +1 -1
- package/dist/server/quota.d.ts +0 -1
- package/dist/server/quota.d.ts.map +1 -1
- package/dist/server/quota.js +0 -1
- package/dist/server/quota.js.map +1 -1
- package/dist/server/readiness.d.ts +1 -1
- package/dist/server/readiness.d.ts.map +1 -1
- package/dist/server/readiness.js +3 -3
- package/dist/server/readiness.js.map +1 -1
- package/dist/server/readiness.test.js +2 -2
- package/dist/server/readiness.test.js.map +1 -1
- package/dist/server/redaction-repair.d.ts +0 -1
- package/dist/server/redaction-repair.d.ts.map +1 -1
- package/dist/server/redaction-repair.js +0 -1
- package/dist/server/redaction-repair.js.map +1 -1
- package/dist/server/rpc-session.js +5 -5
- package/dist/server/rpc-session.js.map +1 -1
- package/dist/server/settings-overlay.js +4 -4
- package/dist/server/settings-overlay.js.map +1 -1
- package/dist/server/settings-overlay.test.js +2 -2
- package/dist/server/settings-overlay.test.js.map +1 -1
- package/dist/server/skills.d.ts.map +1 -1
- package/dist/server/skills.js +14 -12
- package/dist/server/skills.js.map +1 -1
- package/dist/server/skills.test.js +30 -8
- package/dist/server/skills.test.js.map +1 -1
- package/dist/server/test.d.ts.map +1 -1
- package/dist/server/test.js +5 -6
- package/dist/server/test.js.map +1 -1
- package/dist/server/tool-guard.js +4 -4
- package/dist/server/tool-guard.js.map +1 -1
- package/dist/server/tool-guard.test.js +2 -2
- package/dist/server/tool-guard.test.js.map +1 -1
- package/dist/server/wardmote-mcp.d.ts +56 -0
- package/dist/server/wardmote-mcp.d.ts.map +1 -0
- package/dist/server/{paperclip-mcp.js → wardmote-mcp.js} +70 -18
- package/dist/server/wardmote-mcp.js.map +1 -0
- package/dist/ui/parse-stdout.d.ts +0 -1
- package/dist/ui/parse-stdout.d.ts.map +1 -1
- package/dist/ui/parse-stdout.js +1 -3
- package/dist/ui/parse-stdout.js.map +1 -1
- package/package.json +8 -4
- package/dist/server/paperclip-mcp.d.ts +0 -53
- package/dist/server/paperclip-mcp.d.ts.map +0 -1
- package/dist/server/paperclip-mcp.js.map +0 -1
package/dist/server/execute.js
CHANGED
|
@@ -3,11 +3,11 @@ import { createProviderStoppedBoundary } from "@tickernelz/wardmote-adapter-util
|
|
|
3
3
|
import os from "node:os";
|
|
4
4
|
import path from "node:path";
|
|
5
5
|
import { createUsageCheckpointLog } from "@tickernelz/wardmote-adapter-utils/usage-checkpoint";
|
|
6
|
+
import { rehomeLegacyPath } from "@tickernelz/wardmote-shared/home-paths";
|
|
6
7
|
import { inferOpenAiCompatibleBiller, } from "@tickernelz/wardmote-adapter-utils";
|
|
7
|
-
import { adapterExecutionTargetIsRemote, adapterExecutionTargetSessionIdentity, adapterExecutionTargetSessionMatches, adapterExecutionTargetSupportsLiveStdin, adapterExecutionTargetUsesManagedHome,
|
|
8
|
-
import {
|
|
9
|
-
import {
|
|
10
|
-
import { paperclipRestGuidance, } from "@tickernelz/wardmote-adapter-utils/paperclip-mcp";
|
|
8
|
+
import { adapterExecutionTargetIsRemote, adapterExecutionTargetSessionIdentity, adapterExecutionTargetSessionMatches, adapterExecutionTargetSupportsLiveStdin, adapterExecutionTargetUsesManagedHome, adapterExecutionTargetUsesWardmoteBridge, describeAdapterExecutionTarget, ensureAdapterExecutionTargetCommandResolvable, ensureAdapterExecutionTargetDirectory, ensureAdapterExecutionTargetRuntimeCommandInstalled, overrideAdapterExecutionTargetRemoteCwd, prepareAdapterExecutionTargetRuntime, readAdapterExecutionTarget, resolveAdapterExecutionTargetCommandForLogs, resolveAdapterExecutionTargetTimeoutSec, runAdapterExecutionTargetProcess, startAdapterExecutionTargetWardmoteBridge, } from "@tickernelz/wardmote-adapter-utils/execution-target";
|
|
9
|
+
import { wardmoteAgentPromptTemplate, appendWithCap, asBoolean, asNumber, asString, buildInvocationEnvForLogs, buildWardmoteEnv, buildRuntimeToolsEnv, ensureAbsoluteDirectory, ensurePathInEnv, joinPromptSections, parseObject, readWardmoteIssueWorkModeFromContext, refreshWardmoteWorkspaceEnvForExecution, renderWardmoteWakePrompt, renderTemplate, isForbiddenConfigEnvKey, isWardmoteRuntimeEnvKey, sanitizeInheritedWardmoteEnv, selectWardmoteTaskMarkdown, } from "@tickernelz/wardmote-adapter-utils/server-utils";
|
|
10
|
+
import { wardmoteRestGuidance, } from "@tickernelz/wardmote-adapter-utils/wardmote-mcp";
|
|
11
11
|
import { OMP_INSTALL_COMMAND } from "../metadata.js";
|
|
12
12
|
import { prepareOmpRuntimeConfig, resolveOmpCommand, } from "./config.js";
|
|
13
13
|
import { createOmpJsonlParser, createOmpOutputAccumulator, isOmpUnknownSessionError, parseOmpJsonLine, } from "./parse.js";
|
|
@@ -21,7 +21,7 @@ import { writeOmpSettingsOverlay } from "./settings-overlay.js";
|
|
|
21
21
|
import { createOmpModelFallbackTracker, ompFallbackChain } from "./model-fallback.js";
|
|
22
22
|
import { writeOmpToolGuardExtension } from "./tool-guard.js";
|
|
23
23
|
import { prependPythonPath, writeOmpPythonEnvBridge } from "./python-env.js";
|
|
24
|
-
import {
|
|
24
|
+
import { WARDMOTE_MCP_BIN, WARDMOTE_MCP_CREDENTIAL_CODE, WARDMOTE_MCP_TRANSIENT_FAILURE_RE, WARDMOTE_MCP_SERVER_NAME, WARDMOTE_MCP_TOOLSETS_ENV, WARDMOTE_MCP_UNAVAILABLE_CODE, createMcpConnectFailureDetector, wardmoteMcpUnavailableRecovery, wardmoteMcpGuidance, wardmoteMcpEndpoint, wardmoteMcpTransport, probeWardmoteMcpEndpoint, wardmoteMcpToolsets, probeWardmoteMcpServer, resolveWardmoteMcpServerCommand, writeWardmoteMcpExtension, } from "./wardmote-mcp.js";
|
|
25
25
|
const RESULT_TRANSCRIPT_MAX_CHARS = 16 * 1024;
|
|
26
26
|
const RESULT_TOOL_CALL_MAX_CHARS = 4 * 1024;
|
|
27
27
|
/** Keeps a tool call's result to a diagnostic tail so a verbose run stays inside the result budget. */
|
|
@@ -121,7 +121,7 @@ function safePathSegment(value) {
|
|
|
121
121
|
function executionCwdsMatch(saved, current, remote) {
|
|
122
122
|
return remote
|
|
123
123
|
? path.posix.normalize(saved) === path.posix.normalize(current)
|
|
124
|
-
:
|
|
124
|
+
: rehomeLegacyPath(saved) === rehomeLegacyPath(current);
|
|
125
125
|
}
|
|
126
126
|
function stringsOnly(env) {
|
|
127
127
|
return Object.fromEntries(Object.entries(env).filter((entry) => typeof entry[1] === "string"));
|
|
@@ -157,7 +157,7 @@ function resolveBiller(env, provider) {
|
|
|
157
157
|
: provider ?? inferOpenAiCompatibleBiller(env, null) ?? "unknown";
|
|
158
158
|
}
|
|
159
159
|
function addWakeEnvironment(env, runId, context) {
|
|
160
|
-
env.
|
|
160
|
+
env.WARDMOTE_RUN_ID = runId;
|
|
161
161
|
const taskId = asString(context.taskId, "").trim() || asString(context.issueId, "").trim();
|
|
162
162
|
const wakeReason = asString(context.wakeReason, "").trim();
|
|
163
163
|
const wakeCommentId = asString(context.wakeCommentId, "").trim() || asString(context.commentId, "").trim();
|
|
@@ -166,21 +166,21 @@ function addWakeEnvironment(env, runId, context) {
|
|
|
166
166
|
const linkedIssueIds = Array.isArray(context.issueIds)
|
|
167
167
|
? context.issueIds.filter((value) => typeof value === "string" && value.trim().length > 0)
|
|
168
168
|
: [];
|
|
169
|
-
const issueWorkMode =
|
|
169
|
+
const issueWorkMode = readWardmoteIssueWorkModeFromContext(context);
|
|
170
170
|
if (taskId)
|
|
171
|
-
env.
|
|
171
|
+
env.WARDMOTE_TASK_ID = taskId;
|
|
172
172
|
if (wakeReason)
|
|
173
|
-
env.
|
|
173
|
+
env.WARDMOTE_WAKE_REASON = wakeReason;
|
|
174
174
|
if (wakeCommentId)
|
|
175
|
-
env.
|
|
175
|
+
env.WARDMOTE_WAKE_COMMENT_ID = wakeCommentId;
|
|
176
176
|
if (approvalId)
|
|
177
|
-
env.
|
|
177
|
+
env.WARDMOTE_APPROVAL_ID = approvalId;
|
|
178
178
|
if (approvalStatus)
|
|
179
|
-
env.
|
|
179
|
+
env.WARDMOTE_APPROVAL_STATUS = approvalStatus;
|
|
180
180
|
if (linkedIssueIds.length > 0)
|
|
181
|
-
env.
|
|
181
|
+
env.WARDMOTE_LINKED_ISSUE_IDS = linkedIssueIds.join(",");
|
|
182
182
|
if (issueWorkMode)
|
|
183
|
-
env.
|
|
183
|
+
env.WARDMOTE_ISSUE_WORK_MODE = issueWorkMode;
|
|
184
184
|
}
|
|
185
185
|
export function buildOmpArgs(input) {
|
|
186
186
|
const { config } = input;
|
|
@@ -290,8 +290,8 @@ export function buildOmpArgs(input) {
|
|
|
290
290
|
args.push("--add-dir=" + resolved);
|
|
291
291
|
}
|
|
292
292
|
}
|
|
293
|
-
if (input.context && Array.isArray(input.context.
|
|
294
|
-
for (const ws of input.context.
|
|
293
|
+
if (input.context && Array.isArray(input.context.wardmoteWorkspaces)) {
|
|
294
|
+
for (const ws of input.context.wardmoteWorkspaces) {
|
|
295
295
|
if (ws && typeof ws === "object" && !Array.isArray(ws)) {
|
|
296
296
|
const wsCwd = asString(ws.cwd, "").trim();
|
|
297
297
|
if (wsCwd) {
|
|
@@ -309,8 +309,8 @@ export function buildOmpArgs(input) {
|
|
|
309
309
|
args.push(input.userPrompt);
|
|
310
310
|
return args;
|
|
311
311
|
}
|
|
312
|
-
export const OMP_TODO_PROMPT_LINE = "For multi-step work, keep your plan in the todo tool;
|
|
313
|
-
const OMP_HEARTBEAT_PROMPT_TEMPLATE = "You are agent {{agent.id}} ({{agent.name}}). Continue your
|
|
312
|
+
export const OMP_TODO_PROMPT_LINE = "For multi-step work, keep your plan in the todo tool; Wardmote shows it to the user live, so no separate checklist is needed.";
|
|
313
|
+
const OMP_HEARTBEAT_PROMPT_TEMPLATE = "You are agent {{agent.id}} ({{agent.name}}). Continue your Wardmote work under the execution contract in your system prompt.";
|
|
314
314
|
async function findOmpSessionFile(sessionDir, sessionId) {
|
|
315
315
|
const entries = await fs.readdir(sessionDir).catch(() => []);
|
|
316
316
|
const match = entries.find((entry) => entry.endsWith(`${sessionId}.jsonl`));
|
|
@@ -350,31 +350,31 @@ async function buildPrompts(input) {
|
|
|
350
350
|
}
|
|
351
351
|
catch (error) {
|
|
352
352
|
const reason = error instanceof Error ? error.message : String(error);
|
|
353
|
-
await input.onLog("stderr", `[
|
|
353
|
+
await input.onLog("stderr", `[wardmote] Warning: could not read agent instructions file "${resolvedPath}": ${reason}\n`);
|
|
354
354
|
notes.push(`Configured instructionsFilePath ${resolvedPath}, but it could not be read.`);
|
|
355
355
|
}
|
|
356
356
|
}
|
|
357
|
-
const contractTemplate =
|
|
358
|
-
const
|
|
359
|
-
const systemPrompt = joinPromptSections([instructions,
|
|
357
|
+
const contractTemplate = wardmoteAgentPromptTemplate(input.wardmoteAccess);
|
|
358
|
+
const wardmoteContract = renderTemplate(contractTemplate, templateData);
|
|
359
|
+
const systemPrompt = joinPromptSections([instructions, wardmoteContract, OMP_TODO_PROMPT_LINE]);
|
|
360
360
|
const promptTemplate = asString(input.config.promptTemplate, OMP_HEARTBEAT_PROMPT_TEMPLATE);
|
|
361
361
|
const bootstrapTemplate = asString(input.config.bootstrapPromptTemplate, "");
|
|
362
362
|
const bootstrapPrompt = !input.resumedSession && bootstrapTemplate.trim()
|
|
363
363
|
? renderTemplate(bootstrapTemplate, templateData).trim()
|
|
364
364
|
: "";
|
|
365
|
-
const taskContextNote =
|
|
366
|
-
const wakePrompt =
|
|
365
|
+
const taskContextNote = selectWardmoteTaskMarkdown(input.context, { resumedSession: input.resumedSession });
|
|
366
|
+
const wakePrompt = renderWardmoteWakePrompt(input.context.wardmoteWake, {
|
|
367
367
|
resumedSession: input.resumedSession,
|
|
368
368
|
suppressIssueDescription: taskContextNote.length > 0,
|
|
369
|
-
|
|
369
|
+
wardmoteAccess: input.wardmoteAccess,
|
|
370
370
|
});
|
|
371
|
-
const wakePayload = parseObject(input.context.
|
|
371
|
+
const wakePayload = parseObject(input.context.wardmoteWake);
|
|
372
372
|
const recoveryWake = Object.keys(parseObject(wakePayload.recovery)).length > 0 ||
|
|
373
373
|
asString(wakePayload.reason, "").trim() === "source_scoped_recovery_action";
|
|
374
374
|
const heartbeatPrompt = ((input.resumedSession && wakePrompt.length > 0) || recoveryWake)
|
|
375
375
|
? ""
|
|
376
376
|
: renderTemplate(promptTemplate, templateData).trim();
|
|
377
|
-
const sessionHandoff = asString(input.context.
|
|
377
|
+
const sessionHandoff = asString(input.context.wardmoteSessionHandoffMarkdown, "").trim();
|
|
378
378
|
const userPrompt = joinPromptSections([
|
|
379
379
|
bootstrapPrompt,
|
|
380
380
|
wakePrompt,
|
|
@@ -414,21 +414,21 @@ export function applyRuntimeToolAccess(env, tools, mcp) {
|
|
|
414
414
|
if (tools) {
|
|
415
415
|
Object.assign(env, buildRuntimeToolsEnv(tools));
|
|
416
416
|
sections.push([
|
|
417
|
-
"
|
|
418
|
-
`Bearer token: $
|
|
419
|
-
`Search connections: POST $
|
|
420
|
-
`Request a connection: POST $
|
|
421
|
-
`MCP endpoint: $
|
|
417
|
+
"Wardmote runtime tools are delivered through the environment of this run.",
|
|
418
|
+
`Bearer token: $WARDMOTE_RUNTIME_TOOLS_TOKEN (valid until ${tools.expiresAt}).`,
|
|
419
|
+
`Search connections: POST $WARDMOTE_RUNTIME_TOOLS_CONNECTIONS_SEARCH_URL`,
|
|
420
|
+
`Request a connection: POST $WARDMOTE_RUNTIME_TOOLS_CONNECTION_REQUEST_URL`,
|
|
421
|
+
`MCP endpoint: $WARDMOTE_RUNTIME_TOOLS_MCP_URL`,
|
|
422
422
|
"Send the bearer token as the Authorization header. Never print the token.",
|
|
423
423
|
].join("\n"));
|
|
424
424
|
}
|
|
425
425
|
const servers = mcp?.getServers() ?? [];
|
|
426
426
|
if (servers.length > 0) {
|
|
427
|
-
env.
|
|
428
|
-
env.
|
|
427
|
+
env.WARDMOTE_RUNTIME_MCP_SERVERS = JSON.stringify(servers.map((server) => ({ name: server.name, url: server.url, connectionId: server.connectionId })));
|
|
428
|
+
env.WARDMOTE_RUNTIME_MCP_TOKENS = JSON.stringify(Object.fromEntries(servers.map((server) => [server.name, server.token])));
|
|
429
429
|
sections.push([
|
|
430
|
-
`
|
|
431
|
-
"Endpoints are in $
|
|
430
|
+
`Wardmote provisioned ${servers.length} MCP server(s) for this run: ${servers.map((s) => s.name).join(", ")}.`,
|
|
431
|
+
"Endpoints are in $WARDMOTE_RUNTIME_MCP_SERVERS and their bearer tokens in $WARDMOTE_RUNTIME_MCP_TOKENS, keyed by server name.",
|
|
432
432
|
"OMP loads MCP servers from its agent directory, so reach these over HTTP for this run instead of expecting them in the tool list.",
|
|
433
433
|
].join("\n"));
|
|
434
434
|
}
|
|
@@ -449,7 +449,7 @@ export async function execute(ctx) {
|
|
|
449
449
|
legacyRemoteExecution: ctx.executionTransport?.remoteExecution,
|
|
450
450
|
});
|
|
451
451
|
const remote = adapterExecutionTargetIsRemote(executionTarget);
|
|
452
|
-
const workspace = parseObject(context.
|
|
452
|
+
const workspace = parseObject(context.wardmoteWorkspace);
|
|
453
453
|
const workspaceCwd = asString(workspace.cwd, "").trim();
|
|
454
454
|
const workspaceSource = asString(workspace.source, "");
|
|
455
455
|
const configuredCwd = asString(config.cwd, "").trim();
|
|
@@ -460,7 +460,7 @@ export async function execute(ctx) {
|
|
|
460
460
|
const preparedConfig = await prepareOmpRuntimeConfig(config, { forceMaterialized: remote });
|
|
461
461
|
const providerStop = createProviderStoppedBoundary(ctx.onProviderStopped);
|
|
462
462
|
let restoreWorkspace = null;
|
|
463
|
-
let
|
|
463
|
+
let wardmoteBridge = null;
|
|
464
464
|
let settingsOverlay = null;
|
|
465
465
|
let mcpExtension = null;
|
|
466
466
|
let toolGuardExtension = null;
|
|
@@ -468,13 +468,13 @@ export async function execute(ctx) {
|
|
|
468
468
|
try {
|
|
469
469
|
await ensureOmpSkills(config, preparedConfig.agentDir ?? undefined);
|
|
470
470
|
const configuredEnv = parseObject(config.env);
|
|
471
|
-
const env =
|
|
471
|
+
const env = buildWardmoteEnv(agent, { sameHost: !remote }, ctx.agentIdentity);
|
|
472
472
|
addWakeEnvironment(env, runId, context);
|
|
473
|
-
const workspaceHints = Array.isArray(context.
|
|
474
|
-
? context.
|
|
473
|
+
const workspaceHints = Array.isArray(context.wardmoteWorkspaces)
|
|
474
|
+
? context.wardmoteWorkspaces.filter((value) => value !== null && typeof value === "object" && !Array.isArray(value))
|
|
475
475
|
: [];
|
|
476
476
|
let effectiveExecutionCwd = executionTarget?.kind === "remote" ? executionTarget.remoteCwd : cwd;
|
|
477
|
-
|
|
477
|
+
refreshWardmoteWorkspaceEnvForExecution({
|
|
478
478
|
env,
|
|
479
479
|
envConfig: {},
|
|
480
480
|
workspaceCwd: effectiveWorkspaceCwd,
|
|
@@ -495,15 +495,15 @@ export async function execute(ctx) {
|
|
|
495
495
|
continue;
|
|
496
496
|
if (isForbiddenConfigEnvKey(key))
|
|
497
497
|
continue;
|
|
498
|
-
if (
|
|
498
|
+
if (isWardmoteRuntimeEnvKey(key) && Object.hasOwn(env, key))
|
|
499
499
|
continue;
|
|
500
500
|
env[key] = value;
|
|
501
501
|
}
|
|
502
|
-
if (!env.
|
|
503
|
-
env.
|
|
502
|
+
if (!env.WARDMOTE_API_KEY && authToken)
|
|
503
|
+
env.WARDMOTE_API_KEY = authToken;
|
|
504
504
|
const runtimeToolGuidance = applyRuntimeToolAccess(env, ctx.runtimeTools, ctx.runtimeMcp);
|
|
505
505
|
applyPreparedOmpAgentEnvironment(env, preparedConfig);
|
|
506
|
-
const inheritedLocalEnv = stringsOnly(
|
|
506
|
+
const inheritedLocalEnv = stringsOnly(sanitizeInheritedWardmoteEnv(process.env));
|
|
507
507
|
applyPreparedOmpAgentEnvironment(inheritedLocalEnv, preparedConfig, null);
|
|
508
508
|
if (preparedConfig.materialized || (preparedConfig.profileSpecified && preparedConfig.profile === null)) {
|
|
509
509
|
inheritedLocalEnv.OMP_PROFILE = "";
|
|
@@ -534,7 +534,7 @@ export async function execute(ctx) {
|
|
|
534
534
|
let runtimeRootDir = null;
|
|
535
535
|
let executionConfig = config;
|
|
536
536
|
if (remote) {
|
|
537
|
-
await onLog("stdout", `[
|
|
537
|
+
await onLog("stdout", `[wardmote] Syncing workspace and OMP runtime assets to ${describeAdapterExecutionTarget(executionTarget)}.\n`);
|
|
538
538
|
const preparedTarget = await prepareAdapterExecutionTargetRuntime({
|
|
539
539
|
runId,
|
|
540
540
|
target: executionTarget,
|
|
@@ -556,7 +556,7 @@ export async function execute(ctx) {
|
|
|
556
556
|
applyPreparedOmpAgentEnvironment(env, preparedConfig, preparedTarget.assetDirs.agentDir ?? null);
|
|
557
557
|
if (adapterExecutionTargetUsesManagedHome(executionTarget) && runtimeRootDir)
|
|
558
558
|
env.HOME = runtimeRootDir;
|
|
559
|
-
|
|
559
|
+
refreshWardmoteWorkspaceEnvForExecution({
|
|
560
560
|
env,
|
|
561
561
|
envConfig: {},
|
|
562
562
|
workspaceCwd: effectiveWorkspaceCwd,
|
|
@@ -575,19 +575,19 @@ export async function execute(ctx) {
|
|
|
575
575
|
applyPreparedOmpAgentEnvironment(env, preparedConfig, preparedTarget.assetDirs.agentDir ?? null);
|
|
576
576
|
}
|
|
577
577
|
const runtimeTarget = overrideAdapterExecutionTargetRemoteCwd(executionTarget, effectiveExecutionCwd);
|
|
578
|
-
if (remote &&
|
|
579
|
-
|
|
578
|
+
if (remote && adapterExecutionTargetUsesWardmoteBridge(runtimeTarget)) {
|
|
579
|
+
wardmoteBridge = await startAdapterExecutionTargetWardmoteBridge({
|
|
580
580
|
runId,
|
|
581
581
|
target: runtimeTarget,
|
|
582
582
|
runtimeRootDir,
|
|
583
583
|
adapterKey: "omp",
|
|
584
584
|
timeoutSec,
|
|
585
|
-
hostApiToken: env.
|
|
586
|
-
hostApiUrl: env.
|
|
585
|
+
hostApiToken: env.WARDMOTE_API_KEY,
|
|
586
|
+
hostApiUrl: env.WARDMOTE_API_URL,
|
|
587
587
|
onLog,
|
|
588
588
|
});
|
|
589
|
-
if (
|
|
590
|
-
Object.assign(env,
|
|
589
|
+
if (wardmoteBridge)
|
|
590
|
+
Object.assign(env, wardmoteBridge.env);
|
|
591
591
|
}
|
|
592
592
|
const omitProfile = preparedConfig.materialized || (preparedConfig.profileSpecified && preparedConfig.profile === null);
|
|
593
593
|
const invocationEnv = remote ? stringsOnly(ensurePathInEnv(env)) : localRuntimeEnv;
|
|
@@ -610,11 +610,11 @@ export async function execute(ctx) {
|
|
|
610
610
|
(!savedCwd || executionCwdsMatch(savedCwd, effectiveExecutionCwd, remote)) &&
|
|
611
611
|
adapterExecutionTargetSessionMatches(savedRemoteExecution, runtimeTarget));
|
|
612
612
|
if (savedSessionId && !canResume) {
|
|
613
|
-
await onLog("stdout", `[
|
|
613
|
+
await onLog("stdout", `[wardmote] OMP session "${savedSessionId}" does not match the current workspace or execution target; starting fresh.\n`);
|
|
614
614
|
}
|
|
615
615
|
const configuredSessionDir = asString(executionConfig.sessionDir, "").trim();
|
|
616
616
|
const defaultSessionDir = remote
|
|
617
|
-
? path.posix.join(runtimeRootDir ?? path.posix.join(effectiveExecutionCwd, ".
|
|
617
|
+
? path.posix.join(runtimeRootDir ?? path.posix.join(effectiveExecutionCwd, ".wardmote-runtime", "omp"), "sessions", safePathSegment(agent.id))
|
|
618
618
|
: path.join(os.homedir(), ".omp", "paperclip", "sessions", safePathSegment(agent.id));
|
|
619
619
|
const sessionDir = canResume && savedSessionDir
|
|
620
620
|
? savedSessionDir
|
|
@@ -642,42 +642,42 @@ export async function execute(ctx) {
|
|
|
642
642
|
});
|
|
643
643
|
const fallbackChain = ompFallbackChain(executionConfig);
|
|
644
644
|
const rpcActive = ompRpcSteeringEnabled(executionConfig) && adapterExecutionTargetSupportsLiveStdin(runtimeTarget);
|
|
645
|
-
const mcpToolsets =
|
|
646
|
-
const mcpEnabled = asBoolean(executionConfig.
|
|
647
|
-
const mcpTransport =
|
|
645
|
+
const mcpToolsets = wardmoteMcpToolsets(executionConfig);
|
|
646
|
+
const mcpEnabled = asBoolean(executionConfig.wardmoteMcp, true);
|
|
647
|
+
const mcpTransport = wardmoteMcpTransport(executionConfig);
|
|
648
648
|
const mcpCommand = remote || mcpTransport === "http"
|
|
649
|
-
? { command:
|
|
650
|
-
:
|
|
651
|
-
const mcpApiKey = asString(invocationEnv.
|
|
652
|
-
const mcpEndpoint =
|
|
649
|
+
? { command: WARDMOTE_MCP_BIN, args: ["--toolsets", mcpToolsets], source: "path" }
|
|
650
|
+
: resolveWardmoteMcpServerCommand();
|
|
651
|
+
const mcpApiKey = asString(invocationEnv.WARDMOTE_API_KEY, "").trim();
|
|
652
|
+
const mcpEndpoint = wardmoteMcpEndpoint(asString(invocationEnv.WARDMOTE_API_URL, ""), mcpToolsets);
|
|
653
653
|
let mcpProbe = null;
|
|
654
654
|
if (mcpEnabled && mcpApiKey && (mcpTransport === "http" || !remote)) {
|
|
655
655
|
mcpProbe = mcpTransport === "http"
|
|
656
|
-
? await
|
|
656
|
+
? await probeWardmoteMcpEndpoint({
|
|
657
657
|
url: mcpEndpoint,
|
|
658
658
|
apiKey: mcpApiKey,
|
|
659
|
-
runId: asString(invocationEnv.
|
|
659
|
+
runId: asString(invocationEnv.WARDMOTE_RUN_ID, runId),
|
|
660
660
|
})
|
|
661
|
-
: await
|
|
661
|
+
: await probeWardmoteMcpServer({
|
|
662
662
|
command: mcpCommand,
|
|
663
|
-
env: { ...invocationEnv, [
|
|
663
|
+
env: { ...invocationEnv, [WARDMOTE_MCP_TOOLSETS_ENV]: mcpToolsets },
|
|
664
664
|
});
|
|
665
665
|
if (!mcpProbe.ok) {
|
|
666
666
|
const source = mcpTransport === "http" ? mcpEndpoint : mcpCommand.command;
|
|
667
667
|
const message = mcpProbe.credentialRejected
|
|
668
|
-
? `
|
|
669
|
-
: `
|
|
670
|
-
await onLog("stderr", `[
|
|
668
|
+
? `Wardmote MCP endpoint (${source}) rejected this run's credentials: ${mcpProbe.detail}`
|
|
669
|
+
: `Wardmote MCP ${mcpTransport === "http" ? "endpoint" : "server"} (${source}) is unavailable: ${mcpProbe.detail}`;
|
|
670
|
+
await onLog("stderr", `[wardmote] ${message}\n`);
|
|
671
671
|
return {
|
|
672
672
|
exitCode: 1,
|
|
673
673
|
signal: null,
|
|
674
674
|
timedOut: false,
|
|
675
675
|
errorMessage: message,
|
|
676
676
|
...(mcpProbe.credentialRejected
|
|
677
|
-
? { errorCode:
|
|
677
|
+
? { errorCode: WARDMOTE_MCP_CREDENTIAL_CODE }
|
|
678
678
|
: {
|
|
679
|
-
errorCode:
|
|
680
|
-
...(mcpProbe.transient ?
|
|
679
|
+
errorCode: WARDMOTE_MCP_UNAVAILABLE_CODE,
|
|
680
|
+
...(mcpProbe.transient ? wardmoteMcpUnavailableRecovery() : {}),
|
|
681
681
|
}),
|
|
682
682
|
usageComplete: true,
|
|
683
683
|
usageBasis: "per_run",
|
|
@@ -688,7 +688,7 @@ export async function execute(ctx) {
|
|
|
688
688
|
executionRecovery: { kind: "bootstrap", providerWorkStarted: false },
|
|
689
689
|
resultJson: {
|
|
690
690
|
capabilityManifest: rpcActive ? RPC_CAPABILITY_MANIFEST : CAPABILITY_MANIFEST,
|
|
691
|
-
|
|
691
|
+
wardmoteMcp: {
|
|
692
692
|
transport: mcpTransport,
|
|
693
693
|
source,
|
|
694
694
|
toolsets: mcpToolsets,
|
|
@@ -700,13 +700,13 @@ export async function execute(ctx) {
|
|
|
700
700
|
}
|
|
701
701
|
}
|
|
702
702
|
if (mcpEnabled && !mcpApiKey) {
|
|
703
|
-
await onLog("stderr", "[
|
|
703
|
+
await onLog("stderr", "[wardmote] Warning: this run carries no Wardmote API key, so the Wardmote MCP tools are not armed.\n");
|
|
704
704
|
}
|
|
705
705
|
if (!mcpEnabled) {
|
|
706
|
-
await onLog("stderr", "[
|
|
706
|
+
await onLog("stderr", "[wardmote] Warning: wardmoteMcp is off for this agent. The agent has no Wardmote tools this run and cannot read issues, comment, or update status.\n");
|
|
707
707
|
}
|
|
708
708
|
if (mcpApiKey) {
|
|
709
|
-
mcpExtension = await
|
|
709
|
+
mcpExtension = await writeWardmoteMcpExtension({
|
|
710
710
|
runId,
|
|
711
711
|
target: runtimeTarget,
|
|
712
712
|
remote,
|
|
@@ -747,7 +747,7 @@ export async function execute(ctx) {
|
|
|
747
747
|
}
|
|
748
748
|
const launchOmp = pythonEnvBridge.launch;
|
|
749
749
|
const mcpArmed = mcpEnabled && mcpExtension !== null;
|
|
750
|
-
const
|
|
750
|
+
const wardmoteAccess = mcpArmed ? "mcp" : "rest";
|
|
751
751
|
const prompts = await buildPrompts({
|
|
752
752
|
config: executionConfig,
|
|
753
753
|
context,
|
|
@@ -755,15 +755,15 @@ export async function execute(ctx) {
|
|
|
755
755
|
runId,
|
|
756
756
|
resumedSession: canResume,
|
|
757
757
|
cwd,
|
|
758
|
-
|
|
758
|
+
wardmoteAccess,
|
|
759
759
|
onLog,
|
|
760
760
|
});
|
|
761
761
|
prompts.systemPrompt = joinPromptSections([
|
|
762
762
|
prompts.systemPrompt,
|
|
763
763
|
runtimeToolGuidance,
|
|
764
764
|
mcpArmed
|
|
765
|
-
?
|
|
766
|
-
:
|
|
765
|
+
? wardmoteMcpGuidance(mcpToolsets, mcpProbe?.toolCount ?? null)
|
|
766
|
+
: wardmoteRestGuidance(),
|
|
767
767
|
]);
|
|
768
768
|
prompts.promptMetrics.systemPromptChars = prompts.systemPrompt.length;
|
|
769
769
|
const commandNotes = [
|
|
@@ -775,10 +775,10 @@ export async function execute(ctx) {
|
|
|
775
775
|
? "OMP runs in RPC mode: the prompt travels on stdin and same-turn steering is available for this run."
|
|
776
776
|
: "OMP runs in one-shot print mode; same-turn steering is unavailable for this run.",
|
|
777
777
|
mcpArmed
|
|
778
|
-
? `
|
|
778
|
+
? `Wardmote MCP server armed from ${mcpCommand.source === "path" ? WARDMOTE_MCP_BIN : mcpCommand.command} with toolsets ${mcpToolsets}${mcpProbe ? ` (${mcpProbe.toolCount ?? 0} tools, handshake ${mcpProbe.durationMs}ms)` : ""}`
|
|
779
779
|
: mcpEnabled
|
|
780
|
-
? "
|
|
781
|
-
: "
|
|
780
|
+
? "Wardmote MCP server not armed: this run has no Wardmote API key."
|
|
781
|
+
: "Wardmote MCP server disabled by adapter configuration; the agent has no Wardmote tools this run.",
|
|
782
782
|
];
|
|
783
783
|
const runAttempt = async (resumeSessionId) => {
|
|
784
784
|
const args = buildOmpArgs({
|
|
@@ -822,7 +822,7 @@ export async function execute(ctx) {
|
|
|
822
822
|
const accumulator = createOmpOutputAccumulator();
|
|
823
823
|
const fallbackTracker = fallbackChain
|
|
824
824
|
? createOmpModelFallbackTracker({
|
|
825
|
-
primary: asString(context.
|
|
825
|
+
primary: asString(context.wardmotePrimaryModel, "").trim() || fallbackChain.key,
|
|
826
826
|
start: fallbackChain.key,
|
|
827
827
|
emit: ctx.onEvent,
|
|
828
828
|
})
|
|
@@ -843,14 +843,14 @@ export async function execute(ctx) {
|
|
|
843
843
|
};
|
|
844
844
|
let mcpConnectFailed = false;
|
|
845
845
|
let mcpConnectTransient = false;
|
|
846
|
+
const connectFailureDetector = createMcpConnectFailureDetector();
|
|
846
847
|
let stdoutTranscript = "";
|
|
847
848
|
const bufferedOnLog = async (stream, chunk) => {
|
|
848
|
-
const connectFailure = mcpArmed && !mcpConnectFailed ?
|
|
849
|
-
if (connectFailure) {
|
|
849
|
+
const connectFailure = mcpArmed && !mcpConnectFailed ? connectFailureDetector.push(stream, chunk) : null;
|
|
850
|
+
if (connectFailure !== null) {
|
|
850
851
|
mcpConnectFailed = true;
|
|
851
|
-
|
|
852
|
-
|
|
853
|
-
await queueLog("stderr", "[paperclip] The Paperclip MCP server did not connect, so the agent has no Paperclip tools. Stopping the run.\n");
|
|
852
|
+
mcpConnectTransient = WARDMOTE_MCP_TRANSIENT_FAILURE_RE.test(connectFailure);
|
|
853
|
+
await queueLog("stderr", "[wardmote] The Wardmote MCP server did not connect, so the agent has no Wardmote tools. Stopping the run.\n");
|
|
854
854
|
triggerProcessAbort();
|
|
855
855
|
}
|
|
856
856
|
if (stream === "stderr") {
|
|
@@ -965,7 +965,7 @@ export async function execute(ctx) {
|
|
|
965
965
|
onSpawn: handleSpawn,
|
|
966
966
|
onRuntimeProgress: ctx.onRuntimeProgress,
|
|
967
967
|
onLog: accountingLog,
|
|
968
|
-
runLogTail:
|
|
968
|
+
runLogTail: wardmoteBridge?.runLogTail,
|
|
969
969
|
});
|
|
970
970
|
}
|
|
971
971
|
if (stdoutBuffer) {
|
|
@@ -1030,7 +1030,7 @@ export async function execute(ctx) {
|
|
|
1030
1030
|
const provider = attempt.parsed.provider ?? configuredModelProvider(asString(executionConfig.model, "").trim());
|
|
1031
1031
|
const model = attempt.parsed.model ?? (asString(executionConfig.model, "").trim() || null);
|
|
1032
1032
|
const mcpFailure = attempt.mcpConnectFailed
|
|
1033
|
-
? `
|
|
1033
|
+
? `Wardmote MCP server "${WARDMOTE_MCP_SERVER_NAME}" failed to connect; the agent had no Wardmote tools.`
|
|
1034
1034
|
: "";
|
|
1035
1035
|
const fallbackError = mcpFailure || rpcPromptError || parsedError || stderrLine || `OMP exited with code ${effectiveExitCode}.`;
|
|
1036
1036
|
const failed = effectiveExitCode !== 0 || attempt.proc.timedOut || attempt.mcpConnectFailed;
|
|
@@ -1045,10 +1045,10 @@ export async function execute(ctx) {
|
|
|
1045
1045
|
: { errorCode: null, errorFamily: null, retryNotBefore: null };
|
|
1046
1046
|
const failureContract = attempt.mcpConnectFailed
|
|
1047
1047
|
? {
|
|
1048
|
-
errorCode:
|
|
1048
|
+
errorCode: WARDMOTE_MCP_UNAVAILABLE_CODE,
|
|
1049
1049
|
errorFamily: null,
|
|
1050
1050
|
retryNotBefore: null,
|
|
1051
|
-
...(attempt.mcpConnectTransient ?
|
|
1051
|
+
...(attempt.mcpConnectTransient ? wardmoteMcpUnavailableRecovery() : {}),
|
|
1052
1052
|
}
|
|
1053
1053
|
: classification;
|
|
1054
1054
|
const cancelled = ctx.signal?.aborted === true && (failed || attempt.proc.signal !== null);
|
|
@@ -1125,7 +1125,7 @@ export async function execute(ctx) {
|
|
|
1125
1125
|
if (canResume &&
|
|
1126
1126
|
initialFailed &&
|
|
1127
1127
|
isOmpUnknownSessionError(initial.proc.stdout, initial.proc.stderr)) {
|
|
1128
|
-
await onLog("stdout", `[
|
|
1128
|
+
await onLog("stdout", `[wardmote] OMP session "${savedSessionId}" is unavailable; retrying once with a fresh session.\n`);
|
|
1129
1129
|
const retry = await runAttempt(null);
|
|
1130
1130
|
return attachSessionBytes(toResult(retry, true, initial));
|
|
1131
1131
|
}
|
|
@@ -1138,7 +1138,7 @@ export async function execute(ctx) {
|
|
|
1138
1138
|
}
|
|
1139
1139
|
finally {
|
|
1140
1140
|
await Promise.all([
|
|
1141
|
-
|
|
1141
|
+
wardmoteBridge?.stop(),
|
|
1142
1142
|
restoreWorkspace?.(),
|
|
1143
1143
|
]);
|
|
1144
1144
|
}
|