agents-bridge 0.1.1 → 0.1.2

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.
Files changed (64) hide show
  1. package/README.md +12 -12
  2. package/dist/agents/agent-resolver.d.ts +12 -0
  3. package/dist/agents/agent-resolver.js +1 -0
  4. package/dist/agents/agent-resolver.js.map +1 -1
  5. package/dist/agents/agent-router.d.ts +8 -0
  6. package/dist/agents/cli-output.d.ts +35 -0
  7. package/dist/agents/cli-output.d.ts.map +1 -0
  8. package/dist/agents/cli-output.js +277 -0
  9. package/dist/agents/cli-output.js.map +1 -0
  10. package/dist/agents/cli-output.test.d.ts +2 -0
  11. package/dist/agents/cli-output.test.d.ts.map +1 -0
  12. package/dist/agents/cli-output.test.js +56 -0
  13. package/dist/agents/cli-output.test.js.map +1 -0
  14. package/dist/agents/cli-runner.d.ts +23 -0
  15. package/dist/agents/cli-runner.d.ts.map +1 -1
  16. package/dist/agents/cli-runner.js +196 -157
  17. package/dist/agents/cli-runner.js.map +1 -1
  18. package/dist/agents/cli-runner.test.d.ts +2 -0
  19. package/dist/agents/cli-runner.test.d.ts.map +1 -0
  20. package/dist/agents/cli-runner.test.js +119 -0
  21. package/dist/agents/cli-runner.test.js.map +1 -0
  22. package/dist/agents/cli-session-store.d.ts +47 -0
  23. package/dist/agents/cli-session-store.d.ts.map +1 -1
  24. package/dist/agents/cli-session-store.js +29 -0
  25. package/dist/agents/cli-session-store.js.map +1 -1
  26. package/dist/agents/cli-session-store.test.d.ts +2 -0
  27. package/dist/agents/cli-session-store.test.d.ts.map +1 -0
  28. package/dist/agents/cli-session-store.test.js +30 -0
  29. package/dist/agents/cli-session-store.test.js.map +1 -0
  30. package/dist/agents/codex-app-server-runtime.d.ts +72 -0
  31. package/dist/agents/codex-app-server-runtime.d.ts.map +1 -0
  32. package/dist/agents/codex-app-server-runtime.js +772 -0
  33. package/dist/agents/codex-app-server-runtime.js.map +1 -0
  34. package/dist/agents/codex-app-server-runtime.test.d.ts +2 -0
  35. package/dist/agents/codex-app-server-runtime.test.d.ts.map +1 -0
  36. package/dist/agents/codex-app-server-runtime.test.js +164 -0
  37. package/dist/agents/codex-app-server-runtime.test.js.map +1 -0
  38. package/dist/agents/model-selection.d.ts +3 -2
  39. package/dist/agents/model-selection.js +1 -1
  40. package/dist/channels/botlink.d.ts +2 -0
  41. package/dist/cli/cmd-start.d.ts.map +1 -1
  42. package/dist/cli/cmd-start.js +154 -16
  43. package/dist/cli/cmd-start.js.map +1 -1
  44. package/dist/cli/run-main.js +27 -27
  45. package/dist/config/paths.d.ts +4 -0
  46. package/dist/config/paths.d.ts.map +1 -1
  47. package/dist/config/paths.js +7 -0
  48. package/dist/config/paths.js.map +1 -1
  49. package/dist/config/zod-schema.d.ts +656 -51
  50. package/dist/config/zod-schema.d.ts.map +1 -1
  51. package/dist/config/zod-schema.js +16 -0
  52. package/dist/config/zod-schema.js.map +1 -1
  53. package/dist/entry.d.ts +1 -1
  54. package/dist/logger.d.ts +1 -0
  55. package/dist/logger.d.ts.map +1 -1
  56. package/dist/logger.js +28 -5
  57. package/dist/logger.js.map +1 -1
  58. package/dist/types/index.d.ts +39 -0
  59. package/dist/types/index.d.ts.map +1 -1
  60. package/package.json +1 -1
  61. package/dist/console-encoding.d.ts +0 -6
  62. package/dist/console-encoding.d.ts.map +0 -1
  63. package/dist/console-encoding.js +0 -35
  64. package/dist/console-encoding.js.map +0 -1
@@ -0,0 +1,119 @@
1
+ import assert from 'node:assert/strict';
2
+ import { mkdtemp, rm } from 'node:fs/promises';
3
+ import { join } from 'node:path';
4
+ import { tmpdir } from 'node:os';
5
+ import test from 'node:test';
6
+ import { LocalCliTurnExecutor } from './cli-runner.js';
7
+ import { CliSessionStore } from './cli-session-store.js';
8
+ const CODEX_BACKEND = {
9
+ command: 'codex',
10
+ runtimeMode: 'app-server',
11
+ sessionIdFields: ['thread_id'],
12
+ sessionMode: 'existing',
13
+ serialize: true,
14
+ appServer: {
15
+ requestTimeoutMs: 30_000,
16
+ startupTimeoutMs: 15_000,
17
+ approvalPolicy: 'never',
18
+ sandbox: 'read-only',
19
+ },
20
+ };
21
+ function createLogger() {
22
+ return {
23
+ debug() { return undefined; },
24
+ info() { return undefined; },
25
+ warn() { return undefined; },
26
+ error() { return undefined; },
27
+ };
28
+ }
29
+ function createEnvelope(sessionId) {
30
+ return {
31
+ sessionId,
32
+ source: {
33
+ channel: 'botlink',
34
+ chatId: 1,
35
+ chatType: 'private',
36
+ userId: 1,
37
+ messageId: 1,
38
+ },
39
+ content: {
40
+ text: 'reply with exactly OK',
41
+ mentions: [],
42
+ attachments: [],
43
+ },
44
+ meta: {
45
+ timestamp: Date.now(),
46
+ raw: {},
47
+ },
48
+ };
49
+ }
50
+ test('LocalCliTurnExecutor clears stale codex thread id and retries fresh via app-server runtime', async () => {
51
+ const tempDir = await mkdtemp(join(tmpdir(), 'agent-bridge-cli-runner-'));
52
+ const storePath = join(tempDir, 'cli-sessions.json');
53
+ const sessionStore = new CliSessionStore(storePath);
54
+ await sessionStore.setCliSessionId('session-1', 'codex-cli', 'thread-stale', {
55
+ model: 'gpt-5.4',
56
+ });
57
+ const runtimeCalls = [];
58
+ const fakeRuntime = {
59
+ async run(params) {
60
+ runtimeCalls.push(params.existingThreadId);
61
+ if (params.existingThreadId) {
62
+ throw new Error('no rollout found for thread id thread-stale');
63
+ }
64
+ return {
65
+ text: 'READY',
66
+ cliSessionId: 'thread-fresh',
67
+ isResume: false,
68
+ diagnostics: {
69
+ queueWaitMs: 0,
70
+ commandElapsedMs: 10,
71
+ totalElapsedMs: 10,
72
+ outputMode: 'app-server',
73
+ runtimeMode: 'app-server',
74
+ hadStdout: false,
75
+ hadStderr: false,
76
+ reconnectCount: 0,
77
+ fellBackToHttps: false,
78
+ threadOperation: 'start',
79
+ threadOperationElapsedMs: 3,
80
+ },
81
+ };
82
+ },
83
+ async teardown() { },
84
+ };
85
+ const executor = new LocalCliTurnExecutor({
86
+ config: {
87
+ agents: {
88
+ defaults: {
89
+ model: { primary: 'codex-cli/gpt-5.4' },
90
+ cliBackends: {
91
+ 'codex-cli': CODEX_BACKEND,
92
+ },
93
+ },
94
+ },
95
+ },
96
+ logger: createLogger(),
97
+ sessionStore,
98
+ createCodexRuntime: () => fakeRuntime,
99
+ });
100
+ try {
101
+ const result = await executor.run({
102
+ envelope: createEnvelope('session-1'),
103
+ provider: 'codex-cli',
104
+ model: 'gpt-5.4',
105
+ workspaceDir: process.cwd(),
106
+ timeoutMs: 60_000,
107
+ });
108
+ assert.equal(result.text, 'READY');
109
+ assert.equal(result.cliSessionId, 'thread-fresh');
110
+ assert.equal(result.isResume, false);
111
+ assert.deepEqual(runtimeCalls, ['thread-stale', undefined]);
112
+ assert.equal(await sessionStore.getCliSessionId('session-1', 'codex-cli'), 'thread-fresh');
113
+ }
114
+ finally {
115
+ await executor.teardown();
116
+ await rm(tempDir, { recursive: true, force: true });
117
+ }
118
+ });
119
+ //# sourceMappingURL=cli-runner.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cli-runner.test.js","sourceRoot":"","sources":["../../src/agents/cli-runner.test.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,47 @@
1
+ import type { SessionStoreEntry } from '../types/index.js';
2
+ /**
3
+ * Build an agent-prefixed session key.
4
+ * Format: agent:{agentId}:{originalSessionKey}
5
+ */
6
+ export declare function makeAgentSessionKey(agentId: string, originalSessionKey: string): string;
7
+ /**
8
+ * Parse an agent-prefixed session key.
9
+ * Returns { agentId, originalKey } or null if not in new format.
10
+ */
11
+ export declare function parseAgentSessionKey(key: string): {
12
+ agentId: string;
13
+ originalKey: string;
14
+ } | null;
15
+ export declare class CliSessionStore {
16
+ private readonly filePath;
17
+ private cache;
18
+ private queue;
19
+ constructor(filePath?: string);
20
+ get(sessionKey: string): Promise<SessionStoreEntry | undefined>;
21
+ list(): Promise<Record<string, SessionStoreEntry>>;
22
+ /**
23
+ * Look up a session key with fallback to legacy (non-prefixed) format.
24
+ * If found under legacy key, migrates it to the new key and deletes the old one.
25
+ */
26
+ getWithLegacyFallback(agentSessionKey: string, legacyKey: string): Promise<SessionStoreEntry | undefined>;
27
+ ensureSession(sessionKey: string, metadata?: {
28
+ provider?: string;
29
+ model?: string;
30
+ }): Promise<SessionStoreEntry>;
31
+ getCliSessionId(sessionKey: string, provider: string): Promise<string | undefined>;
32
+ setCliSessionId(sessionKey: string, provider: string, cliSessionId: string, metadata?: {
33
+ model?: string;
34
+ }): Promise<SessionStoreEntry>;
35
+ clearCliSessionId(sessionKey: string, provider: string, metadata?: {
36
+ model?: string;
37
+ }): Promise<SessionStoreEntry | undefined>;
38
+ findIncompleteSessions(provider?: string): Promise<Array<{
39
+ sessionKey: string;
40
+ provider: string;
41
+ entry: SessionStoreEntry;
42
+ }>>;
43
+ private mutate;
44
+ private load;
45
+ private save;
46
+ }
47
+ //# sourceMappingURL=cli-session-store.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"cli-session-store.d.ts","sourceRoot":"","sources":["../../src/agents/cli-session-store.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAU1D;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAEvF;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CASjG;AASD,qBAAa,eAAe;IAId,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAHrC,OAAO,CAAC,KAAK,CAAmC;IAChD,OAAO,CAAC,KAAK,CAAoB;gBAEJ,QAAQ,SAA8B;IAE7D,GAAG,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAMrE;;;OAGG;IACG,qBAAqB,CACzB,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAgBnC,aAAa,CACjB,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GAC/C,OAAO,CAAC,iBAAiB,CAAC;IAevB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAOlF,eAAe,CACnB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,QAAQ,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GAC5B,OAAO,CAAC,iBAAiB,CAAC;IAsBvB,iBAAiB,CACrB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GAC5B,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;YAyB3B,MAAM;YAkBN,IAAI;YAqBJ,IAAI;CAMnB"}
1
+ {"version":3,"file":"cli-session-store.d.ts","sourceRoot":"","sources":["../../src/agents/cli-session-store.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAU1D;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAEvF;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CASjG;AAUD,qBAAa,eAAe;IAId,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAHrC,OAAO,CAAC,KAAK,CAAmC;IAChD,OAAO,CAAC,KAAK,CAAoB;gBAEJ,QAAQ,SAA8B;IAE7D,GAAG,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAM/D,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAOxD;;;OAGG;IACG,qBAAqB,CACzB,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAgBnC,aAAa,CACjB,UAAU,EAAE,MAAM,EAClB,QAAQ,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GAC/C,OAAO,CAAC,iBAAiB,CAAC;IAevB,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAOlF,eAAe,CACnB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,EACpB,QAAQ,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GAC5B,OAAO,CAAC,iBAAiB,CAAC;IAsBvB,iBAAiB,CACrB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,QAAQ,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GAC5B,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAyBnC,sBAAsB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;QAC7D,UAAU,EAAE,MAAM,CAAA;QAClB,QAAQ,EAAE,MAAM,CAAA;QAChB,KAAK,EAAE,iBAAiB,CAAA;KACzB,CAAC,CAAC;YA+BW,MAAM;YAkBN,IAAI;YAqBJ,IAAI;CAMnB"}
@@ -32,6 +32,7 @@ function cloneEntry(entry) {
32
32
  return {
33
33
  ...entry,
34
34
  cliSessionIds: entry.cliSessionIds ? { ...entry.cliSessionIds } : undefined,
35
+ workspaceDir: entry.workspaceDir,
35
36
  };
36
37
  }
37
38
  export class CliSessionStore {
@@ -46,6 +47,10 @@ export class CliSessionStore {
46
47
  const entry = store.sessions[sessionKey];
47
48
  return entry ? cloneEntry(entry) : undefined;
48
49
  }
50
+ async list() {
51
+ const store = await this.load();
52
+ return Object.fromEntries(Object.entries(store.sessions).map(([sessionKey, entry]) => [sessionKey, cloneEntry(entry)]));
53
+ }
49
54
  /**
50
55
  * Look up a session key with fallback to legacy (non-prefixed) format.
51
56
  * If found under legacy key, migrates it to the new key and deletes the old one.
@@ -126,6 +131,30 @@ export class CliSessionStore {
126
131
  return cloneEntry(entry);
127
132
  });
128
133
  }
134
+ async findIncompleteSessions(provider) {
135
+ const sessions = await this.list();
136
+ const expectedProvider = provider ? normalizeProviderId(provider) : undefined;
137
+ const results = [];
138
+ for (const [sessionKey, entry] of Object.entries(sessions)) {
139
+ const normalizedProvider = entry.provider ? normalizeProviderId(entry.provider) : undefined;
140
+ if (!normalizedProvider) {
141
+ continue;
142
+ }
143
+ if (expectedProvider && normalizedProvider !== expectedProvider) {
144
+ continue;
145
+ }
146
+ const cliSessionId = entry.cliSessionIds?.[normalizedProvider]?.trim();
147
+ if (cliSessionId) {
148
+ continue;
149
+ }
150
+ results.push({
151
+ sessionKey,
152
+ provider: normalizedProvider,
153
+ entry,
154
+ });
155
+ }
156
+ return results;
157
+ }
129
158
  async mutate(mutator) {
130
159
  const previous = this.queue;
131
160
  let release;
@@ -1 +1 @@
1
- {"version":3,"file":"cli-session-store.js","sourceRoot":"","sources":["../../src/agents/cli-session-store.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cli-session-store.js","sourceRoot":"","sources":["../../src/agents/cli-session-store.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=cli-session-store.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cli-session-store.test.d.ts","sourceRoot":"","sources":["../../src/agents/cli-session-store.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,30 @@
1
+ import assert from 'node:assert/strict';
2
+ import { mkdtemp, rm } from 'node:fs/promises';
3
+ import { join } from 'node:path';
4
+ import { tmpdir } from 'node:os';
5
+ import test from 'node:test';
6
+ import { CliSessionStore } from './cli-session-store.js';
7
+ test('findIncompleteSessions reports codex sessions without persisted thread ids', async () => {
8
+ const tempDir = await mkdtemp(join(tmpdir(), 'agent-bridge-session-store-'));
9
+ const storePath = join(tempDir, 'cli-sessions.json');
10
+ const store = new CliSessionStore(storePath);
11
+ try {
12
+ await store.ensureSession('session-codex-missing', {
13
+ provider: 'codex-cli',
14
+ model: 'gpt-5.4',
15
+ });
16
+ await store.setCliSessionId('session-codex-ready', 'codex-cli', 'thread-1', {
17
+ model: 'gpt-5.4',
18
+ });
19
+ await store.setCliSessionId('session-claude-ready', 'claude-cli', 'conversation-1', {
20
+ model: 'opus',
21
+ });
22
+ const incomplete = await store.findIncompleteSessions('codex-cli');
23
+ assert.deepEqual(incomplete.map((entry) => entry.sessionKey), ['session-codex-missing']);
24
+ assert.equal(incomplete[0]?.provider, 'codex-cli');
25
+ }
26
+ finally {
27
+ await rm(tempDir, { recursive: true, force: true });
28
+ }
29
+ });
30
+ //# sourceMappingURL=cli-session-store.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cli-session-store.test.js","sourceRoot":"","sources":["../../src/agents/cli-session-store.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,oBAAoB,CAAA;AACvC,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAA;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAChC,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAExD,IAAI,CAAC,4EAA4E,EAAE,KAAK,IAAI,EAAE;IAC5F,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,6BAA6B,CAAC,CAAC,CAAA;IAC5E,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,mBAAmB,CAAC,CAAA;IACpD,MAAM,KAAK,GAAG,IAAI,eAAe,CAAC,SAAS,CAAC,CAAA;IAE5C,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,aAAa,CAAC,uBAAuB,EAAE;YACjD,QAAQ,EAAE,WAAW;YACrB,KAAK,EAAE,SAAS;SACjB,CAAC,CAAA;QACF,MAAM,KAAK,CAAC,eAAe,CAAC,qBAAqB,EAAE,WAAW,EAAE,UAAU,EAAE;YAC1E,KAAK,EAAE,SAAS;SACjB,CAAC,CAAA;QACF,MAAM,KAAK,CAAC,eAAe,CAAC,sBAAsB,EAAE,YAAY,EAAE,gBAAgB,EAAE;YAClF,KAAK,EAAE,MAAM;SACd,CAAC,CAAA;QAEF,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAA;QAElE,MAAM,CAAC,SAAS,CACd,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,EAC3C,CAAC,uBAAuB,CAAC,CAC1B,CAAA;QACD,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAA;IACpD,CAAC;YAAS,CAAC;QACT,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;IACrD,CAAC;AACH,CAAC,CAAC,CAAA"}
@@ -0,0 +1,72 @@
1
+ import type { CliBackendConfig, CliRunDiagnostics, CliRunUsage, Logger } from '../types/index.js';
2
+ interface JsonRpcNotification {
3
+ method: string;
4
+ params?: unknown;
5
+ }
6
+ interface CodexAppServerConnection {
7
+ ensureReady(): Promise<void>;
8
+ request<T>(method: string, params: Record<string, unknown>, timeoutMs: number): Promise<T>;
9
+ notify(method: string, params?: Record<string, unknown>): void;
10
+ getRestartCount(): number;
11
+ onNotification(listener: (notification: JsonRpcNotification) => void): void;
12
+ onFatalError(listener: (error: Error) => void): void;
13
+ dispose(): Promise<void>;
14
+ }
15
+ export interface CodexAppServerTurnParams {
16
+ sessionId: string;
17
+ runtimeSessionId: string;
18
+ existingThreadId?: string;
19
+ model: string;
20
+ workspaceDir: string;
21
+ timeoutMs: number;
22
+ noProgressTimeoutMs: number;
23
+ systemPrompt?: string;
24
+ prompt: string;
25
+ imagePaths?: string[];
26
+ }
27
+ export interface CodexAppServerTurnResult {
28
+ text: string;
29
+ cliSessionId: string;
30
+ isResume: boolean;
31
+ usage?: CliRunUsage;
32
+ diagnostics: CliRunDiagnostics;
33
+ }
34
+ export interface CodexTurnRuntime {
35
+ run(params: CodexAppServerTurnParams): Promise<CodexAppServerTurnResult>;
36
+ teardown(): Promise<void>;
37
+ }
38
+ export declare class CodexAppServerRuntime implements CodexTurnRuntime {
39
+ private readonly options;
40
+ private readonly connection;
41
+ private readonly loadedThreads;
42
+ private readonly activeTurnsByThread;
43
+ private readonly activeTurnsByTurn;
44
+ constructor(options: {
45
+ backend: CliBackendConfig;
46
+ logger: Logger;
47
+ connection?: CodexAppServerConnection;
48
+ });
49
+ run(params: CodexAppServerTurnParams): Promise<CodexAppServerTurnResult>;
50
+ teardown(): Promise<void>;
51
+ private ensureThread;
52
+ private runTurn;
53
+ private createActiveTurnState;
54
+ private armNoProgressTimer;
55
+ private bindTurnId;
56
+ private handleNotification;
57
+ private handleTurnStarted;
58
+ private handleItemCompleted;
59
+ private handleTokenUsageUpdated;
60
+ private handleTurnCompleted;
61
+ private handleTurnError;
62
+ private handleFatalError;
63
+ private noteTurnProgress;
64
+ private findTurnState;
65
+ private resolveTurn;
66
+ private rejectTurn;
67
+ private cleanupTurnState;
68
+ private interruptTurn;
69
+ private resolveRequestTimeout;
70
+ }
71
+ export {};
72
+ //# sourceMappingURL=codex-app-server-runtime.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"codex-app-server-runtime.d.ts","sourceRoot":"","sources":["../../src/agents/codex-app-server-runtime.ts"],"names":[],"mappings":"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"}