@desplega.ai/agent-swarm 2.4.4 → 2.4.5
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/{acp-adapter-thq04adh.js → acp-adapter-2wdkktv6.js} +1 -1
- package/dist/{actions-j6ywh6x5.js → actions-c40ebcm4.js} +18 -18
- package/dist/{amp-adapter-k8b5xmj8.js → amp-adapter-wb67m95z.js} +2 -2
- package/dist/{app-rb7vc02s.js → app-353vre8g.js} +3 -3
- package/dist/{assistant-ftta1zjf.js → assistant-sj1njh23.js} +21 -21
- package/dist/{boot-reembed-srp6v6af.js → boot-reembed-b9c3az3c.js} +1 -1
- package/dist/{boot-reembed-xns7h5h9.js → boot-reembed-qdkvxeem.js} +1 -1
- package/dist/{boot-scrub-sweep-3qqrh2mz.js → boot-scrub-sweep-m3wh8eks.js} +2 -2
- package/dist/{boot-seeds-9ks8hce7.js → boot-seeds-j2273s54.js} +4 -4
- package/dist/{claude-adapter-k5ksyres.js → claude-adapter-m7q0a085.js} +2 -2
- package/dist/{claude-managed-adapter-h2y889ge.js → claude-managed-adapter-5ptb6tzs.js} +2 -2
- package/dist/{claude-managed-setup-n5a5eqks.js → claude-managed-setup-smrqk5j5.js} +3 -3
- package/dist/{claude-sdk-session-2j3j4kwn.js → claude-sdk-session-38xnz21e.js} +8284 -8267
- package/dist/{cli-cynvc9fj.js → cli-018r4jq6.js} +5 -5
- package/dist/{cli-9fhkkpj5.js → cli-1f3qzw6y.js} +1 -1
- package/dist/{cli-dqb4n629.js → cli-1sp861s4.js} +7 -7
- package/dist/{cli-gqvh8d8a.js → cli-1syn2xy1.js} +10 -10
- package/dist/{cli-qkhc5aqy.js → cli-37j04k05.js} +11 -11
- package/dist/{cli-1d70crsy.js → cli-3a45zcgm.js} +1 -1
- package/dist/{cli-t7cyef5g.js → cli-43x64hv3.js} +4 -4
- package/dist/{cli-hj3debgw.js → cli-4zfqgjc5.js} +2 -2
- package/dist/{cli-55qmbp6z.js → cli-7c9qs530.js} +1 -1
- package/dist/{cli-9qtjfd60.js → cli-848hxdwj.js} +1 -1
- package/dist/{cli-pccfmtb5.js → cli-94gwyg7m.js} +7 -7
- package/dist/{cli-51y09c6p.js → cli-9hstj09h.js} +5 -5
- package/dist/{cli-zrwpctp4.js → cli-9yqgm9nd.js} +22 -22
- package/dist/{cli-esxerzg7.js → cli-a92r1127.js} +1 -1
- package/dist/{cli-b8k7epj1.js → cli-be2161h1.js} +7 -7
- package/dist/{cli-xc27fwzg.js → cli-bnes4z6b.js} +2 -2
- package/dist/{cli-zrk6jxv8.js → cli-cxxe61f6.js} +1 -1
- package/dist/{cli-amyhm3gj.js → cli-dk44dxec.js} +1 -1
- package/dist/{cli-nc35pxb7.js → cli-eww120g8.js} +1 -0
- package/dist/{cli-a0kcty51.js → cli-f01h25yt.js} +1 -1
- package/dist/{cli-82d3nkc3.js → cli-f0g3pgvf.js} +1 -1
- package/dist/{cli-1ephgwnq.js → cli-ftc1g5tj.js} +2 -2
- package/dist/{cli-2v045xyf.js → cli-fv5hepyy.js} +3 -3
- package/dist/{cli-bnz0r3kc.js → cli-g35m2xwm.js} +4 -4
- package/dist/{cli-qje9k2nh.js → cli-g9ypd5en.js} +12 -2
- package/dist/{cli-w6nadkh4.js → cli-j99azg3g.js} +3 -3
- package/dist/{cli-er83cjbn.js → cli-k8g16gz3.js} +416 -116
- package/dist/{cli-4dg55wsk.js → cli-kpw04va0.js} +1 -1
- package/dist/{cli-3cgngyd8.js → cli-ms85309d.js} +33 -15
- package/dist/{cli-v3yr2gbg.js → cli-n72rg53p.js} +1471 -635
- package/dist/{cli-37yb7307.js → cli-p14m2cnp.js} +1 -1
- package/dist/{cli-2zqpkvtt.js → cli-qfxc84gh.js} +1 -1
- package/dist/{cli-44159k28.js → cli-qwhy2qma.js} +1 -1
- package/dist/{cli-2y91wnbh.js → cli-st8aw1m6.js} +221 -9
- package/dist/{cli-vq97g1jq.js → cli-tw4p90jb.js} +92 -192
- package/dist/{cli-te6b5wvg.js → cli-v0yrfmdh.js} +1 -1
- package/dist/{cli-xj0re5tm.js → cli-v8fjakwf.js} +1 -1
- package/dist/{cli-p20r8w42.js → cli-wt0jf9hm.js} +215 -80
- package/dist/{cli-q6r7t299.js → cli-xpa64rek.js} +33 -11
- package/dist/{cli-vdm20wej.js → cli-z7d29rw9.js} +2 -2
- package/dist/cli.js +19 -19
- package/dist/{codex-adapter-968xwfy7.js → codex-adapter-tn6k5mkg.js} +1 -1
- package/dist/{codex-session-runner-ht4z99fa.js → codex-session-runner-7vjt7jbw.js} +1 -1
- package/dist/{commands-pcymaeg9.js → commands-t7rz9146.js} +2 -2
- package/dist/{controller-fpjyk46r.js → controller-m2jasma5.js} +2 -2
- package/dist/{controllers-connect-mwzx1fh6.js → controllers-connect-9ftpex99.js} +19 -19
- package/dist/{cursor-adapter-cp4s2e2f.js → cursor-adapter-mjv79e4z.js} +1 -1
- package/dist/{db-xsjg9jqq.js → db-6sfrn9g3.js} +1 -1
- package/dist/{db-sgd12bt9.js → db-rn673r06.js} +3 -3
- package/dist/{dispatcher-x0jfw2c9.js → dispatcher-c155xz0p.js} +17 -17
- package/dist/{dsh-adapter-jrq7ma7h.js → dsh-adapter-3mmszc1x.js} +1 -1
- package/dist/{external-channel-8njj4h3b.js → external-channel-35k6tkv8.js} +2 -2
- package/dist/{grok-adapter-kkr97v2f.js → grok-adapter-tfrq7tg1.js} +2 -2
- package/dist/handlers-7gw64dxw.js +39 -0
- package/dist/{heartbeat-wd03zhn0.js → heartbeat-dyg4npkp.js} +20 -20
- package/dist/{hook-f0vghj42.js → hook-drspbwpe.js} +1 -1
- package/dist/{hook-xzj2ts2p.js → hook-x26b31bg.js} +1 -1
- package/dist/{http-4hwxv62p.js → http-pk972xyw.js} +355 -216
- package/dist/{index-ww2vznkp.js → index-arytgj5q.js} +1 -1
- package/dist/{index-hg0x2cdv.js → index-bgdyvcnv.js} +17 -17
- package/dist/{index-c4ykd0f1.js → index-dr94zbnh.js} +13348 -11611
- package/dist/{index-gdh8jrdm.js → index-gabbcdn2.js} +17 -17
- package/dist/{index-97q4xn03.js → index-jwxkkex2.js} +129 -75
- package/dist/index-tfb26zhy.js +41 -0
- package/dist/{keepalive-hrh7xnr9.js → keepalive-7yrng7px.js} +3 -3
- package/dist/{lead-ee8vazz2.js → lead-7e02z839.js} +29 -29
- package/dist/{maintenance-e8wnwnqx.js → maintenance-e6cemdqt.js} +1 -1
- package/dist/{node-3v3f08f7.js → node-de6akczr.js} +10 -9
- package/dist/{oauth-refresh-sweep-zm0yj4sj.js → oauth-refresh-sweep-yw3xdbcj.js} +2 -2
- package/dist/{onboard-dtwcq603.js → onboard-0a9y5yrc.js} +2 -2
- package/dist/{otel-impl-w3fbhpn0.js → otel-impl-trjpkfb7.js} +1 -1
- package/dist/{pricing-refresh-j38dehfs.js → pricing-refresh-d2b5my0y.js} +3 -3
- package/dist/{rbac-roles-ejxx9b35.js → rbac-roles-hey3yv9d.js} +2 -2
- package/dist/{rbac-roles-ae8yttq4.js → rbac-roles-nxh5ahwk.js} +1 -1
- package/dist/{registry-rxw10xzg.js → registry-ajhexe44.js} +1 -1
- package/dist/{render-v2-n16n0phe.js → render-v2-rr3p2atg.js} +3 -3
- package/dist/{resume-z0fgjc38.js → resume-2efkf1s1.js} +5 -5
- package/dist/{session-access-cv3mq6mc.js → session-access-s2mttxpw.js} +4 -4
- package/dist/{setup-mafhj3yt.js → setup-vypma5yt.js} +1 -1
- package/dist/{work-objects-8b86mgjp.js → work-objects-rvhckdkp.js} +20 -20
- package/dist/{worker-16s75hm5.js → worker-5snytpbd.js} +29 -29
- package/openapi.json +9 -2
- package/package.json +7 -7
- package/src/apps/catalog.generated.json +206 -4
- package/src/apps/page-validator.ts +13 -1
- package/src/be/chunking.ts +42 -9
- package/src/be/db/tasks/draft-text.ts +15 -0
- package/src/be/db/tasks/read.ts +14 -1
- package/src/be/db.ts +5 -1
- package/src/be/memory/index-content.ts +36 -17
- package/src/be/memory/providers/openai-embedding.ts +115 -61
- package/src/be/memory/providers/sqlite-store.ts +69 -23
- package/src/be/memory/reranker.ts +31 -1
- package/src/be/memory/search-candidates.ts +47 -0
- package/src/be/memory/types.ts +14 -0
- package/src/be/scripts/typecheck.ts +2 -0
- package/src/be/seed-scripts/catalog/heartbeat-jev-gate.ts +106 -54
- package/src/be/seed-scripts/index.ts +2 -2
- package/src/be/swarm-config-guard.ts +24 -1
- package/src/be/task-attachment-store.ts +30 -0
- package/src/extensions/catalog.generated.json +4 -4
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/extensions/contract.ts +7 -0
- package/src/fs/provider.ts +13 -1
- package/src/heartbeat/heartbeat.ts +31 -11
- package/src/http/fs.ts +54 -34
- package/src/http/mcp-body.ts +37 -0
- package/src/http/mcp-user.ts +3 -5
- package/src/http/mcp.ts +6 -7
- package/src/http/memory.ts +26 -15
- package/src/http/page-proxy.ts +61 -5
- package/src/http/pages-public.ts +27 -44
- package/src/http/pages.ts +4 -4
- package/src/http/script-runs.ts +2 -0
- package/src/http/users.ts +12 -1
- package/src/integrations/chat-sdk/adapters.ts +7 -3
- package/src/integrations/chat-sdk/attachments.ts +90 -12
- package/src/integrations/chat-sdk/facts.ts +120 -0
- package/src/integrations/chat-sdk/inbound.ts +156 -8
- package/src/integrations/chat-sdk/limits.ts +24 -0
- package/src/integrations/chat-sdk/outbound-files.ts +186 -0
- package/src/integrations/chat-sdk/outbound.ts +234 -4
- package/src/integrations/chat-sdk/relay.ts +4 -1
- package/src/integrations/chat-sdk/router.ts +28 -2
- package/src/integrations/chat-sdk/steering.ts +9 -0
- package/src/integrations/chat-sdk/templates.ts +14 -0
- package/src/integrations/chat-sdk/thread-buffer.ts +4 -0
- package/src/mcp-limits.ts +20 -0
- package/src/pages/browser-sdk.ts +8 -3
- package/src/pages/feedback-overlay.ts +1 -1
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/codex-adapter.ts +106 -119
- package/src/providers/codex-agents-md.ts +35 -229
- package/src/providers/cursor-adapter.ts +1 -1
- package/src/realtime/transport.ts +1 -2
- package/src/script-workflows/workflow-ctx.ts +1 -0
- package/src/scripts-runtime/types/stdlib.d.ts +2 -0
- package/src/scripts-runtime/types/swarm-extension.d.ts +8 -0
- package/src/scripts-runtime/types/swarm-sdk.d.ts +2 -0
- package/src/server-user.ts +2 -0
- package/src/server.ts +2 -0
- package/src/slack/assistant.ts +2 -2
- package/src/slack/files.ts +2 -0
- package/src/slack/handlers.ts +4 -4
- package/src/slack/inbound-files.ts +39 -6
- package/src/slack/thread-buffer.ts +2 -1
- package/src/tasks/task-terminal-effects.ts +21 -17
- package/src/tests/apps-card-grid.test.ts +197 -0
- package/src/tests/apps-catalog-additions.test.ts +120 -0
- package/src/tests/apps-tree.test.ts +129 -0
- package/src/tests/chat-sdk-attachments-reply.test.ts +52 -0
- package/src/tests/chat-sdk-config.test.ts +11 -0
- package/src/tests/chat-sdk-facts.test.ts +23 -0
- package/src/tests/chat-sdk-inbound.test.ts +558 -4
- package/src/tests/chat-sdk-outbound-files.test.ts +652 -0
- package/src/tests/codex-adapter.test.ts +167 -242
- package/src/tests/config-api-only-keys.test.ts +9 -0
- package/src/tests/cors-allowlist.test.ts +1 -1
- package/src/tests/extensions-example-slack-reply-gate.test.ts +262 -91
- package/src/tests/heartbeat-checklist.test.ts +33 -0
- package/src/tests/heartbeat-jev-gate-credentials.test.ts +44 -0
- package/src/tests/heartbeat-jev-gate.test.ts +242 -1
- package/src/tests/kv-page-proxy.test.ts +91 -5
- package/src/tests/launch-password-rejection.test.ts +2 -2
- package/src/tests/mcp-input-caps.test.ts +294 -0
- package/src/tests/memory-chunked-search-starvation.test.ts +200 -0
- package/src/tests/memory-embedding-input-cap.test.ts +114 -0
- package/src/tests/memory.test.ts +14 -0
- package/src/tests/page-guest-session.test.ts +19 -8
- package/src/tests/page-proxy-authed.test.ts +1 -1
- package/src/tests/page-proxy.test.ts +17 -10
- package/src/tests/page-session.test.ts +102 -1
- package/src/tests/pages-authed-mode.test.ts +82 -12
- package/src/tests/pages-password-mode.test.ts +5 -5
- package/src/tests/realtime-transport.test.ts +13 -7
- package/src/tests/script-runs-http.test.ts +84 -0
- package/src/tests/scripts-http.test.ts +10 -1
- package/src/tests/swarm-config-export-to-env.test.ts +22 -3
- package/src/tests/task-audio-transcription.test.ts +299 -0
- package/src/tests/task-completion-memory-chunking.test.ts +434 -0
- package/src/tests/task-terminal-secret-scrub.test.ts +6 -1
- package/src/tests/transcription.test.ts +299 -0
- package/src/tests/workflow-system-one-decision-providers.test.ts +98 -1
- package/src/tests/workflow-system-one-decision.test.ts +2 -1
- package/src/tools/chat-access.ts +10 -0
- package/src/tools/chat-post.ts +31 -11
- package/src/tools/chat-reply.ts +32 -10
- package/src/tools/memory-search.ts +3 -1
- package/src/tools/system-one-decide.ts +17 -4
- package/src/types.ts +6 -0
- package/src/utils/config-env-export.ts +3 -1
- package/src/utils/page-session.ts +133 -20
- package/src/utils/transcription.ts +246 -0
- package/src/workflows/executors/system-one-decision.ts +28 -7
- package/src/workflows/executors/system-one-providers.ts +39 -4
- package/templates/extensions/slack-reply-gate/README.md +24 -22
- package/templates/extensions/slack-reply-gate/hooks.ts +146 -95
- package/templates/extensions/slack-reply-gate/manifest.json +2 -2
- package/templates/skills/apps/SKILL.md +28 -6
- package/templates/skills/apps/content.md +28 -6
- package/templates/skills/chat-sdk/content.md +6 -2
- package/templates/skills/code-quality/content.md +2 -1
- package/templates/skills/heartbeat-runbook/content.md +5 -5
- package/templates/skills/pages/content.md +6 -4
- package/templates/skills/swarm-scripts/SKILL.md +2 -2
- package/templates/skills/swarm-scripts/content.md +2 -2
- package/dist/handlers-0pvee9nw.js +0 -39
- package/dist/index-thm0y6a8.js +0 -41
|
@@ -52,7 +52,7 @@ import {
|
|
|
52
52
|
import {
|
|
53
53
|
DEFAULT_MODEL_TIER_MAP,
|
|
54
54
|
init_types
|
|
55
|
-
} from "./cli-
|
|
55
|
+
} from "./cli-eww120g8.js";
|
|
56
56
|
import {
|
|
57
57
|
runtimeCatalogModel,
|
|
58
58
|
init_runtime_model_catalog
|
|
@@ -60,7 +60,7 @@ import {
|
|
|
60
60
|
import {
|
|
61
61
|
init_package,
|
|
62
62
|
package_default
|
|
63
|
-
} from "./cli-
|
|
63
|
+
} from "./cli-94gwyg7m.js";
|
|
64
64
|
import {
|
|
65
65
|
isEnvFlagEnabled,
|
|
66
66
|
isSessionSummarySkipped,
|
|
@@ -92,135 +92,42 @@ init_env_flag();
|
|
|
92
92
|
init_secret_scrubber();
|
|
93
93
|
|
|
94
94
|
// src/providers/codex-agents-md.ts
|
|
95
|
-
import { lstat,
|
|
95
|
+
import { lstat, realpath, symlink, unlink } from "node:fs/promises";
|
|
96
96
|
import { homedir } from "node:os";
|
|
97
|
-
import {
|
|
98
|
-
var BLOCK_OPEN = "<swarm_system_prompt>";
|
|
99
|
-
var BLOCK_CLOSE = "</swarm_system_prompt>";
|
|
97
|
+
import { join, resolve, sep } from "node:path";
|
|
100
98
|
var BLOCK_REGEX = /<swarm_system_prompt>[\s\S]*?<\/swarm_system_prompt>\n?/;
|
|
101
|
-
var
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
const
|
|
107
|
-
return await file.exists() ? await file.text() : null;
|
|
108
|
-
}
|
|
109
|
-
function recordPathFor(stateDir, realCwd) {
|
|
99
|
+
var STATE_DIR = join(homedir(), ".cache", "agent-swarm", "codex-agents-md");
|
|
100
|
+
async function recoverLegacyCodexAgentsMd(cwd) {
|
|
101
|
+
if (!cwd)
|
|
102
|
+
return;
|
|
103
|
+
const realCwd = await realpath(cwd).catch(() => resolve(cwd));
|
|
104
|
+
const agentsMdPath = join(realCwd, "AGENTS.md");
|
|
110
105
|
const key = new Bun.CryptoHasher("sha256").update(realCwd).digest("hex");
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
try {
|
|
115
|
-
const record = JSON.parse(await Bun.file(recordPath).text());
|
|
116
|
-
if (record.cwd === realCwd && typeof record.linkTarget === "string") {
|
|
117
|
-
return { cwd: record.cwd, linkTarget: record.linkTarget };
|
|
118
|
-
}
|
|
119
|
-
} catch {}
|
|
120
|
-
return null;
|
|
121
|
-
}
|
|
122
|
-
async function inTreeTarget(realCwd, agentsMdPath, linkTarget) {
|
|
123
|
-
const target = await realpath(resolve(dirname(agentsMdPath), linkTarget)).catch(() => null);
|
|
124
|
-
const prefix = realCwd.endsWith(sep) ? realCwd : `${realCwd}${sep}`;
|
|
125
|
-
if (target === null || !target.startsWith(prefix)) {
|
|
126
|
-
return null;
|
|
127
|
-
}
|
|
128
|
-
const stat = await lstat(target).catch(() => null);
|
|
129
|
-
return stat?.isFile() ? target : null;
|
|
130
|
-
}
|
|
131
|
-
async function restoreSymlink(agentsMdPath, realCwd, linkTarget) {
|
|
106
|
+
const recordPath = join(STATE_DIR, `${key}.json`);
|
|
107
|
+
const record = await Bun.file(recordPath).json().catch(() => null);
|
|
108
|
+
const linkTarget = record?.cwd === realCwd && typeof record.linkTarget === "string" ? record.linkTarget : null;
|
|
132
109
|
const stat = await lstat(agentsMdPath).catch(() => null);
|
|
133
110
|
const current = stat?.isFile() ? await Bun.file(agentsMdPath).text() : null;
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
if (stripped !== await Bun.file(target).text()) {
|
|
145
|
-
await Bun.write(target, stripped);
|
|
146
|
-
}
|
|
147
|
-
}
|
|
148
|
-
async function writeCodexAgentsMd(cwd, systemPrompt, options = {}) {
|
|
149
|
-
if (!cwd || !systemPrompt) {
|
|
150
|
-
return NOOP_HANDLE;
|
|
151
|
-
}
|
|
152
|
-
const agentsMdPath = join(cwd, "AGENTS.md");
|
|
153
|
-
const claudeMdPath = join(cwd, "CLAUDE.md");
|
|
154
|
-
const stateDir = options.stateDir ?? DEFAULT_STATE_DIR;
|
|
155
|
-
const realCwd = await realpath(cwd).catch(() => resolve(cwd));
|
|
156
|
-
const recordPath = recordPathFor(stateDir, realCwd);
|
|
157
|
-
const block = `${BLOCK_OPEN}
|
|
158
|
-
${systemPrompt}
|
|
159
|
-
${BLOCK_CLOSE}`;
|
|
160
|
-
let stat = await lstat(agentsMdPath).catch(() => null);
|
|
161
|
-
const record = await readRecord(recordPath, realCwd);
|
|
162
|
-
if (record) {
|
|
163
|
-
if (stat?.isFile() && BLOCK_REGEX.test(await Bun.file(agentsMdPath).text())) {
|
|
164
|
-
await restoreSymlink(agentsMdPath, realCwd, record.linkTarget);
|
|
165
|
-
stat = await lstat(agentsMdPath);
|
|
166
|
-
}
|
|
167
|
-
await unlink(recordPath).catch(() => {});
|
|
168
|
-
}
|
|
169
|
-
if (stat?.isSymbolicLink()) {
|
|
170
|
-
const linkTarget = await readlink(agentsMdPath);
|
|
171
|
-
const target = await inTreeTarget(realCwd, agentsMdPath, linkTarget);
|
|
172
|
-
const targetContent = target !== null ? await Bun.file(target).text() : "";
|
|
173
|
-
await mkdir(stateDir, { recursive: true });
|
|
174
|
-
await Bun.write(recordPath, JSON.stringify({ cwd: realCwd, linkTarget }));
|
|
175
|
-
await unlink(agentsMdPath);
|
|
176
|
-
await Bun.write(agentsMdPath, `${block}
|
|
177
|
-
${targetContent.replace(BLOCK_REGEX, "")}`);
|
|
178
|
-
return {
|
|
179
|
-
async cleanup() {
|
|
180
|
-
try {
|
|
181
|
-
await restoreSymlink(agentsMdPath, realCwd, linkTarget);
|
|
182
|
-
await unlink(recordPath).catch(() => {});
|
|
183
|
-
} catch {}
|
|
111
|
+
const stripped = current === null ? null : current.replace(BLOCK_REGEX, "");
|
|
112
|
+
if (linkTarget !== null && (!stat || stripped !== null && stripped !== current)) {
|
|
113
|
+
if (stripped !== null) {
|
|
114
|
+
const target = await realpath(resolve(realCwd, linkTarget)).catch(() => null);
|
|
115
|
+
const prefix = realCwd.endsWith(sep) ? realCwd : `${realCwd}${sep}`;
|
|
116
|
+
if (target !== null && target !== agentsMdPath && target.startsWith(prefix)) {
|
|
117
|
+
const targetStat = await lstat(target);
|
|
118
|
+
if (targetStat.isFile() && stripped !== await Bun.file(target).text()) {
|
|
119
|
+
await Bun.write(target, stripped);
|
|
120
|
+
}
|
|
184
121
|
}
|
|
185
|
-
};
|
|
186
|
-
}
|
|
187
|
-
let createdFresh = false;
|
|
188
|
-
let newContent;
|
|
189
|
-
if (!stat) {
|
|
190
|
-
const claudeContent = await readIfExists(claudeMdPath);
|
|
191
|
-
newContent = claudeContent !== null ? `${block}
|
|
192
|
-
|
|
193
|
-
${claudeContent}` : `${block}
|
|
194
|
-
`;
|
|
195
|
-
createdFresh = true;
|
|
196
|
-
} else {
|
|
197
|
-
const existingContent = await Bun.file(agentsMdPath).text();
|
|
198
|
-
if (BLOCK_REGEX.test(existingContent)) {
|
|
199
|
-
newContent = existingContent.replace(BLOCK_REGEX, `${block}
|
|
200
|
-
`);
|
|
201
|
-
} else {
|
|
202
|
-
newContent = `${block}
|
|
203
|
-
${existingContent}`;
|
|
204
122
|
}
|
|
123
|
+
if (stat)
|
|
124
|
+
await unlink(agentsMdPath);
|
|
125
|
+
await symlink(linkTarget, agentsMdPath);
|
|
126
|
+
} else if (stripped !== null && stripped !== current) {
|
|
127
|
+
await Bun.write(agentsMdPath, stripped);
|
|
205
128
|
}
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
async cleanup() {
|
|
209
|
-
try {
|
|
210
|
-
if (createdFresh) {
|
|
211
|
-
await Bun.$`rm -f ${agentsMdPath}`.quiet().nothrow();
|
|
212
|
-
return;
|
|
213
|
-
}
|
|
214
|
-
const currentFile = Bun.file(agentsMdPath);
|
|
215
|
-
if (!await currentFile.exists()) {
|
|
216
|
-
return;
|
|
217
|
-
}
|
|
218
|
-
const currentContent = await currentFile.text();
|
|
219
|
-
const stripped = currentContent.replace(BLOCK_REGEX, "");
|
|
220
|
-
await Bun.write(agentsMdPath, stripped);
|
|
221
|
-
} catch {}
|
|
222
|
-
}
|
|
223
|
-
};
|
|
129
|
+
if (linkTarget !== null)
|
|
130
|
+
await unlink(recordPath);
|
|
224
131
|
}
|
|
225
132
|
|
|
226
133
|
// src/providers/codex-app-server.ts
|
|
@@ -1117,7 +1024,6 @@ class AppServerCodexThread {
|
|
|
1117
1024
|
class CodexSession {
|
|
1118
1025
|
thread;
|
|
1119
1026
|
config;
|
|
1120
|
-
agentsMdHandle;
|
|
1121
1027
|
resolvedModel;
|
|
1122
1028
|
contextWindow;
|
|
1123
1029
|
skillsDir;
|
|
@@ -1142,10 +1048,9 @@ class CodexSession {
|
|
|
1142
1048
|
errorTracker = new SessionErrorTracker;
|
|
1143
1049
|
appliedReasoningEffort;
|
|
1144
1050
|
pendingResult = null;
|
|
1145
|
-
constructor(thread, config,
|
|
1051
|
+
constructor(thread, config, resolvedModel, initialEvents = [], skillsDir, summarizeDeps = {}) {
|
|
1146
1052
|
this.thread = thread;
|
|
1147
1053
|
this.config = config;
|
|
1148
|
-
this.agentsMdHandle = agentsMdHandle;
|
|
1149
1054
|
this.resolvedModel = resolvedModel;
|
|
1150
1055
|
this.contextWindow = getCodexContextWindow(resolvedModel);
|
|
1151
1056
|
this.skillsDir = skillsDir ?? process.env.CODEX_SKILLS_DIR ?? join2(codexUserHome(), ".codex", "skills");
|
|
@@ -1718,7 +1623,6 @@ class CodexSession {
|
|
|
1718
1623
|
try {
|
|
1719
1624
|
await this.logFileHandle.end();
|
|
1720
1625
|
} catch {}
|
|
1721
|
-
await this.agentsMdHandle.cleanup();
|
|
1722
1626
|
const finalResult = this.pendingResult ?? {
|
|
1723
1627
|
exitCode: 1,
|
|
1724
1628
|
sessionId: this._sessionId,
|
|
@@ -1811,75 +1715,71 @@ class CodexSession {
|
|
|
1811
1715
|
}
|
|
1812
1716
|
}
|
|
1813
1717
|
async function createInProcessCodexSession2(config, opts = {}) {
|
|
1814
|
-
|
|
1815
|
-
|
|
1816
|
-
|
|
1817
|
-
|
|
1818
|
-
|
|
1819
|
-
|
|
1820
|
-
|
|
1821
|
-
|
|
1822
|
-
|
|
1823
|
-
|
|
1824
|
-
|
|
1825
|
-
|
|
1826
|
-
|
|
1827
|
-
|
|
1828
|
-
|
|
1829
|
-
|
|
1830
|
-
|
|
1831
|
-
|
|
1832
|
-
|
|
1833
|
-
|
|
1834
|
-
|
|
1835
|
-
|
|
1836
|
-
|
|
1837
|
-
|
|
1838
|
-
|
|
1839
|
-
|
|
1840
|
-
|
|
1841
|
-
|
|
1842
|
-
|
|
1843
|
-
|
|
1844
|
-
|
|
1845
|
-
|
|
1846
|
-
|
|
1847
|
-
|
|
1848
|
-
|
|
1849
|
-
|
|
1850
|
-
|
|
1851
|
-
|
|
1852
|
-
|
|
1853
|
-
|
|
1854
|
-
|
|
1855
|
-
|
|
1856
|
-
|
|
1857
|
-
bufferedEmit({ type: "raw_stderr", content: `${line}
|
|
1718
|
+
await recoverLegacyCodexAgentsMd(config.cwd);
|
|
1719
|
+
const resolvedModel = resolveCodexModel(config.model);
|
|
1720
|
+
const preSessionEvents = [];
|
|
1721
|
+
const bufferedEmit = (event) => {
|
|
1722
|
+
preSessionEvents.push(event);
|
|
1723
|
+
};
|
|
1724
|
+
const mergedConfig = await buildCodexConfig(config, resolvedModel, bufferedEmit);
|
|
1725
|
+
const authMode = await resolveCodexAuthMode(config, bufferedEmit);
|
|
1726
|
+
const env = {
|
|
1727
|
+
PATH: process.env.PATH ?? "",
|
|
1728
|
+
HOME: process.env.HOME ?? "",
|
|
1729
|
+
...authMode !== "chatgpt" && process.env.OPENAI_API_KEY ? { OPENAI_API_KEY: process.env.OPENAI_API_KEY } : {},
|
|
1730
|
+
...process.env.NODE_EXTRA_CA_CERTS ? { NODE_EXTRA_CA_CERTS: process.env.NODE_EXTRA_CA_CERTS } : {},
|
|
1731
|
+
CONTEXT_MODE_EXTERNAL_MCP_NUDGE_EVERY: CTX_MODE_NUDGE_EVERY,
|
|
1732
|
+
...config.env ?? {},
|
|
1733
|
+
...buildOtelTraceparentEnv(config.env ?? process.env),
|
|
1734
|
+
SWARM_CODEX_APP_SERVER: "1"
|
|
1735
|
+
};
|
|
1736
|
+
if (authMode === "chatgpt")
|
|
1737
|
+
delete env.OPENAI_API_KEY;
|
|
1738
|
+
const codexPathOverride = process.env.CODEX_PATH_OVERRIDE;
|
|
1739
|
+
if (config.resumeSessionId) {
|
|
1740
|
+
console.warn("[codex-adapter] resumeSessionId ignored — native resume is disabled by deprecation plan");
|
|
1741
|
+
}
|
|
1742
|
+
let thread;
|
|
1743
|
+
let liveSession;
|
|
1744
|
+
if (opts.threadFactory) {
|
|
1745
|
+
thread = await opts.threadFactory({
|
|
1746
|
+
config,
|
|
1747
|
+
resolvedModel,
|
|
1748
|
+
env,
|
|
1749
|
+
codexConfig: mergedConfig
|
|
1750
|
+
});
|
|
1751
|
+
} else {
|
|
1752
|
+
const appServerFactory = opts.appServerFactory ?? ((options) => new CodexAppServer(options));
|
|
1753
|
+
const client = appServerFactory({
|
|
1754
|
+
...codexPathOverride ? { codexPath: codexPathOverride } : {},
|
|
1755
|
+
env,
|
|
1756
|
+
onStderr: (line) => {
|
|
1757
|
+
if (liveSession)
|
|
1758
|
+
liveSession.emitTransportStderr(line);
|
|
1759
|
+
else
|
|
1760
|
+
bufferedEmit({ type: "raw_stderr", content: `${line}
|
|
1858
1761
|
` });
|
|
1859
|
-
}
|
|
1860
|
-
});
|
|
1861
|
-
try {
|
|
1862
|
-
const response = await client.request("thread/start", {
|
|
1863
|
-
model: resolvedModel,
|
|
1864
|
-
cwd: config.cwd,
|
|
1865
|
-
approvalPolicy: "never",
|
|
1866
|
-
sandbox: "danger-full-access",
|
|
1867
|
-
config: mergedConfig,
|
|
1868
|
-
ephemeral: true
|
|
1869
|
-
});
|
|
1870
|
-
thread = new AppServerCodexThread(client, response.thread.id);
|
|
1871
|
-
} catch (error) {
|
|
1872
|
-
await client.close();
|
|
1873
|
-
throw error;
|
|
1874
1762
|
}
|
|
1763
|
+
});
|
|
1764
|
+
try {
|
|
1765
|
+
const response = await client.request("thread/start", {
|
|
1766
|
+
model: resolvedModel,
|
|
1767
|
+
cwd: config.cwd,
|
|
1768
|
+
developerInstructions: config.systemPrompt,
|
|
1769
|
+
approvalPolicy: "never",
|
|
1770
|
+
sandbox: "danger-full-access",
|
|
1771
|
+
config: mergedConfig,
|
|
1772
|
+
ephemeral: true
|
|
1773
|
+
});
|
|
1774
|
+
thread = new AppServerCodexThread(client, response.thread.id);
|
|
1775
|
+
} catch (error) {
|
|
1776
|
+
await client.close();
|
|
1777
|
+
throw error;
|
|
1875
1778
|
}
|
|
1876
|
-
const session = new CodexSession(thread, config, agentsMdHandle, resolvedModel, preSessionEvents, opts.skillsDir, opts.summarizeDeps ?? {});
|
|
1877
|
-
liveSession = session;
|
|
1878
|
-
return session;
|
|
1879
|
-
} catch (err) {
|
|
1880
|
-
await agentsMdHandle.cleanup();
|
|
1881
|
-
throw err;
|
|
1882
1779
|
}
|
|
1780
|
+
const session = new CodexSession(thread, config, resolvedModel, preSessionEvents, opts.skillsDir, opts.summarizeDeps ?? {});
|
|
1781
|
+
liveSession = session;
|
|
1782
|
+
return session;
|
|
1883
1783
|
}
|
|
1884
1784
|
function resolveCodexRunnerArgv() {
|
|
1885
1785
|
const override = process.env.AGENT_SWARM_CODEX_RUNNER_ARGV;
|