@moxt-ai/mobius 0.0.193 → 0.0.194

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 (74) hide show
  1. package/dist/acp/agent-runtime-manager.js +1 -1
  2. package/dist/acp/agent-runtime-manager.js.map +1 -1
  3. package/dist/acp/agent-session.js +2 -2
  4. package/dist/acp/agent-session.js.map +1 -1
  5. package/dist/acp/native-session.d.ts +1 -0
  6. package/dist/acp/native-session.d.ts.map +1 -1
  7. package/dist/agent-catalog/agents/workbuddy-agent.d.ts.map +1 -1
  8. package/dist/agent-catalog/agents/workbuddy-agent.js +5 -19
  9. package/dist/agent-catalog/agents/workbuddy-agent.js.map +1 -1
  10. package/dist/agent-catalog/discover-agent-settings.d.ts.map +1 -1
  11. package/dist/agent-catalog/discover-agent-settings.js +2 -1
  12. package/dist/agent-catalog/discover-agent-settings.js.map +1 -1
  13. package/dist/agent-catalog/resolve-catalog-agent.d.ts +15 -0
  14. package/dist/agent-catalog/resolve-catalog-agent.d.ts.map +1 -0
  15. package/dist/agent-catalog/resolve-catalog-agent.js +65 -0
  16. package/dist/agent-catalog/resolve-catalog-agent.js.map +1 -0
  17. package/dist/agent-installation/grok-managed-package.d.ts.map +1 -1
  18. package/dist/agent-installation/grok-managed-package.js +5 -16
  19. package/dist/agent-installation/grok-managed-package.js.map +1 -1
  20. package/dist/agent-installation/opencode-managed-release.d.ts.map +1 -1
  21. package/dist/agent-installation/opencode-managed-release.js +9 -16
  22. package/dist/agent-installation/opencode-managed-release.js.map +1 -1
  23. package/dist/cli.js +862 -748
  24. package/dist/cli.js.map +4 -4
  25. package/dist/config.d.ts +7 -1
  26. package/dist/config.d.ts.map +1 -1
  27. package/dist/config.js +2 -1
  28. package/dist/config.js.map +1 -1
  29. package/dist/daemon-history-commands.d.ts.map +1 -1
  30. package/dist/daemon-history-commands.js +3 -2
  31. package/dist/daemon-history-commands.js.map +1 -1
  32. package/dist/daemon-prompt-executor.d.ts.map +1 -1
  33. package/dist/daemon-prompt-executor.js +2 -1
  34. package/dist/daemon-prompt-executor.js.map +1 -1
  35. package/dist/daemon-session-commands.d.ts +2 -1
  36. package/dist/daemon-session-commands.d.ts.map +1 -1
  37. package/dist/daemon-session-commands.js +6 -2
  38. package/dist/daemon-session-commands.js.map +1 -1
  39. package/dist/index.js +867 -744
  40. package/dist/index.js.map +4 -4
  41. package/dist/native-sessions/service.d.ts.map +1 -1
  42. package/dist/native-sessions/service.js +5 -2
  43. package/dist/native-sessions/service.js.map +1 -1
  44. package/dist/pairing/pair-local-machine.d.ts.map +1 -1
  45. package/dist/pairing/pair-local-machine.js +12 -5
  46. package/dist/pairing/pair-local-machine.js.map +1 -1
  47. package/dist/platform/contracts.d.ts +26 -0
  48. package/dist/platform/contracts.d.ts.map +1 -0
  49. package/dist/platform/contracts.js +2 -0
  50. package/dist/platform/contracts.js.map +1 -0
  51. package/dist/platform/index.d.ts +3 -0
  52. package/dist/platform/index.d.ts.map +1 -0
  53. package/dist/platform/index.js +21 -0
  54. package/dist/platform/index.js.map +1 -0
  55. package/dist/platform/linux.d.ts +3 -0
  56. package/dist/platform/linux.d.ts.map +1 -0
  57. package/dist/platform/linux.js +146 -0
  58. package/dist/platform/linux.js.map +1 -0
  59. package/dist/platform/macos.d.ts +3 -0
  60. package/dist/platform/macos.d.ts.map +1 -0
  61. package/dist/platform/macos.js +49 -0
  62. package/dist/platform/macos.js.map +1 -0
  63. package/dist/platform/posix.d.ts +4 -0
  64. package/dist/platform/posix.d.ts.map +1 -0
  65. package/dist/platform/posix.js +47 -0
  66. package/dist/platform/posix.js.map +1 -0
  67. package/dist/process/executable.d.ts +2 -4
  68. package/dist/process/executable.d.ts.map +1 -1
  69. package/dist/process/executable.js +11 -166
  70. package/dist/process/executable.js.map +1 -1
  71. package/dist/runtime.d.ts.map +1 -1
  72. package/dist/runtime.js +885 -762
  73. package/dist/runtime.js.map +4 -4
  74. package/package.json +1 -1
package/dist/config.d.ts CHANGED
@@ -26,12 +26,18 @@ export interface DaemonConfig {
26
26
  readonly localContext: DaemonLocalContext;
27
27
  readonly reconnectTarget: DaemonReconnectTarget | null;
28
28
  readonly relayUrl: URL;
29
+ /**
30
+ * Serves the definition a command should run against, re-discoving the Agent when its
31
+ * executable changed since the catalog snapshot was taken. Undefined keeps the boot-time
32
+ * snapshot: a changed executable fails the command instead of being re-discovered.
33
+ */
34
+ readonly resolveAgent?: (agent: AcpAgentDefinition, signal: AbortSignal) => Promise<AcpAgentDefinition>;
29
35
  }
30
36
  export interface DaemonConnectionConfig {
31
37
  readonly defaultWorkspace: string;
32
38
  readonly channelId: string;
33
39
  readonly relayUrl: URL;
34
40
  }
35
- export declare function createDaemonConfig(connection: DaemonConnectionConfig, agents?: readonly AcpAgentDefinition[], installableAgents?: readonly InstallableAgentDefinition[], localContext?: DaemonLocalContext, reconnectTarget?: DaemonReconnectTarget | null): DaemonConfig;
41
+ export declare function createDaemonConfig(connection: DaemonConnectionConfig, agents?: readonly AcpAgentDefinition[], installableAgents?: readonly InstallableAgentDefinition[], localContext?: DaemonLocalContext, reconnectTarget?: DaemonReconnectTarget | null, resolveAgent?: DaemonConfig["resolveAgent"]): DaemonConfig;
36
42
  export declare function loadDaemonConfig(): DaemonConfig;
37
43
  //# sourceMappingURL=config.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,KAAK,kBAAkB,EACvB,KAAK,0BAA0B,EAC/B,iBAAiB,EACpB,MAAM,gCAAgC,CAAC;AAGxC,YAAY,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,2BAA2B,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAEnG,wBAAgB,oBAAoB,CAAC,WAAW,GAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAe,GAAG,MAAM,CAGnG;AAED,qBAAa,kBAAkB;IAC3B,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAClD,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAEhC,YAAY,cAAc,EAAE,MAAM,EAAE,WAAW,GAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAe,EAGzF;CACJ;AAED,wBAAgB,qBAAqB,CACjC,KAAK,EAAE,kBAAkB,EACzB,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,GACzC,kBAAkB,CAQpB;AAED,8BAAsB,qBAAqB;IACvC,QAAQ,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;CAC7C;AAED,qBAAa,2BAA4B,SAAQ,qBAAqB;IAClE,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IAEjC,YAAY,YAAY,EAAE,MAAM,EAI/B;CACJ;AAED,MAAM,WAAW,YAAY;IACzB,QAAQ,CAAC,MAAM,EAAE,SAAS,kBAAkB,EAAE,CAAC;IAC/C,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,iBAAiB,EAAE,SAAS,0BAA0B,EAAE,CAAC;IAClE,QAAQ,CAAC,YAAY,EAAE,kBAAkB,CAAC;IAC1C,QAAQ,CAAC,eAAe,EAAE,qBAAqB,GAAG,IAAI,CAAC;IACvD,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC;CAC1B;AAED,MAAM,WAAW,sBAAsB;IACnC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAC9B,UAAU,EAAE,sBAAsB,EAClC,MAAM,GAAE,SAAS,kBAAkB,EAAO,EAC1C,iBAAiB,GAAE,SAAS,0BAA0B,EAAO,EAC7D,YAAY,GAAE,kBAA8E,EAC5F,eAAe,GAAE,qBAAqB,GAAG,IAAW,GACrD,YAAY,CAad;AAED,wBAAgB,gBAAgB,IAAI,YAAY,CAmB/C"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAEA,OAAO,EACH,KAAK,kBAAkB,EACvB,KAAK,0BAA0B,EAC/B,iBAAiB,EACpB,MAAM,gCAAgC,CAAC;AAGxC,YAAY,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,2BAA2B,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AAEnG,wBAAgB,oBAAoB,CAAC,WAAW,GAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAe,GAAG,MAAM,CAGnG;AAED,qBAAa,kBAAkB;IAC3B,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAClD,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAEhC,YAAY,cAAc,EAAE,MAAM,EAAE,WAAW,GAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAe,EAGzF;CACJ;AAED,wBAAgB,qBAAqB,CACjC,KAAK,EAAE,kBAAkB,EACzB,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,GACzC,kBAAkB,CAQpB;AAED,8BAAsB,qBAAqB;IACvC,QAAQ,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;CAC7C;AAED,qBAAa,2BAA4B,SAAQ,qBAAqB;IAClE,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IAEjC,YAAY,YAAY,EAAE,MAAM,EAI/B;CACJ;AAED,MAAM,WAAW,YAAY;IACzB,QAAQ,CAAC,MAAM,EAAE,SAAS,kBAAkB,EAAE,CAAC;IAC/C,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,iBAAiB,EAAE,SAAS,0BAA0B,EAAE,CAAC;IAClE,QAAQ,CAAC,YAAY,EAAE,kBAAkB,CAAC;IAC1C,QAAQ,CAAC,eAAe,EAAE,qBAAqB,GAAG,IAAI,CAAC;IACvD,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC;IACvB;;;;OAIG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,kBAAkB,EAAE,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;CAC3G;AAED,MAAM,WAAW,sBAAsB;IACnC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAC9B,UAAU,EAAE,sBAAsB,EAClC,MAAM,GAAE,SAAS,kBAAkB,EAAO,EAC1C,iBAAiB,GAAE,SAAS,0BAA0B,EAAO,EAC7D,YAAY,GAAE,kBAA8E,EAC5F,eAAe,GAAE,qBAAqB,GAAG,IAAW,EACpD,YAAY,CAAC,EAAE,YAAY,CAAC,cAAc,CAAC,GAC5C,YAAY,CAcd;AAED,wBAAgB,gBAAgB,IAAI,YAAY,CAmB/C"}
package/dist/config.js CHANGED
@@ -35,7 +35,7 @@ export class OpaqueDaemonReconnectTarget extends DaemonReconnectTarget {
35
35
  this.commandArgument = `--connection ${connectionId}`;
36
36
  }
37
37
  }
38
- export function createDaemonConfig(connection, agents = [], installableAgents = [], localContext = new DaemonLocalContext(readStateDirectory(), process.env), reconnectTarget = null) {
38
+ export function createDaemonConfig(connection, agents = [], installableAgents = [], localContext = new DaemonLocalContext(readStateDirectory(), process.env), reconnectTarget = null, resolveAgent) {
39
39
  const daemonAgents = agents.map((agent) => withDaemonEnvironment(agent, localContext.environment));
40
40
  return {
41
41
  agents: daemonAgents,
@@ -47,6 +47,7 @@ export function createDaemonConfig(connection, agents = [], installableAgents =
47
47
  localContext,
48
48
  reconnectTarget,
49
49
  relayUrl: connection.relayUrl,
50
+ ...(resolveAgent === undefined ? {} : { resolveAgent }),
50
51
  };
51
52
  }
52
53
  export function loadDaemonConfig() {
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"daemon-history-commands.d.ts","sourceRoot":"","sources":["../src/daemon-history-commands.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,kCAAkC,EACvC,KAAK,mCAAmC,EAG3C,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAqB,KAAK,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAC7F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wCAAwC,CAAC;AACxF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AACpF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACzE,wBAAsB,mCAAmC,CACrD,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,UAAU,CAAC,OAAO,kCAAkC,CAAC,EAC9D,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,yBAAyB,EACtC,KAAK,EAAE,UAAU,EACjB,WAAW,EAAE,0BAA0B,EACvC,QAAQ,EAAE,mBAAmB,EAC7B,cAAc,EAAE,oBAAoB,EACpC,UAAU,EAAE,uBAAuB,EACnC,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,IAAI,CAAC,CAgFf;AAED,wBAAsB,oCAAoC,CACtD,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,UAAU,CAAC,OAAO,mCAAmC,CAAC,EAC/D,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,yBAAyB,EACtC,KAAK,EAAE,UAAU,EACjB,WAAW,EAAE,0BAA0B,EACvC,QAAQ,EAAE,mBAAmB,EAC7B,UAAU,EAAE,uBAAuB,EACnC,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,IAAI,CAAC,CA0Ef"}
1
+ {"version":3,"file":"daemon-history-commands.d.ts","sourceRoot":"","sources":["../src/daemon-history-commands.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,kCAAkC,EACvC,KAAK,mCAAmC,EAG3C,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAqB,KAAK,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAC7F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wCAAwC,CAAC;AACxF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AACpF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACzE,wBAAsB,mCAAmC,CACrD,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,UAAU,CAAC,OAAO,kCAAkC,CAAC,EAC9D,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,yBAAyB,EACtC,KAAK,EAAE,UAAU,EACjB,WAAW,EAAE,0BAA0B,EACvC,QAAQ,EAAE,mBAAmB,EAC7B,cAAc,EAAE,oBAAoB,EACpC,UAAU,EAAE,uBAAuB,EACnC,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,IAAI,CAAC,CAgFf;AAED,wBAAsB,oCAAoC,CACtD,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,UAAU,CAAC,OAAO,mCAAmC,CAAC,EAC/D,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,yBAAyB,EACtC,KAAK,EAAE,UAAU,EACjB,WAAW,EAAE,0BAA0B,EACvC,QAAQ,EAAE,mBAAmB,EAC7B,UAAU,EAAE,uBAAuB,EACnC,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,IAAI,CAAC,CA0Ef"}
@@ -2,6 +2,7 @@ import { SESSION_LIVE_HISTORY_V2_PAGE_LOADED_KIND, SESSION_PREVIEW_HISTORY_PAGE_
2
2
  import { AcpExecutionError } from "./acp/agent-runtime-manager.js";
3
3
  import { resolveSessionDirectories } from "./authorization/resolve-session-directories.js";
4
4
  import { operationErrorCode, reportOperationFailure, send } from "./daemon-command-results.js";
5
+ import { resolveCatalogAgent } from "./daemon-session-commands.js";
5
6
  export async function executeSessionLiveHistoryV2PageLoad(socket, command, config, directories, audit, diagnostics, sessions, nativeSessions, eventLogV2, signal) {
6
7
  let agentId;
7
8
  try {
@@ -13,7 +14,7 @@ export async function executeSessionLiveHistoryV2PageLoad(socket, command, confi
13
14
  const resolved = await resolveSessionDirectories(directories, config.bindingId, entry.directoryId, entry.additionalDirectories.map((directory) => directory.directoryId), signal);
14
15
  const loadOptions = {
15
16
  additionalDirectories: resolved.additionalDirectories,
16
- agent: config.catalog.find(entry.agentId),
17
+ agent: await resolveCatalogAgent(config, entry.agentId, signal),
17
18
  cwd: resolved.cwd,
18
19
  sessionId: command.sessionId,
19
20
  signal,
@@ -70,7 +71,7 @@ export async function executeSessionPreviewHistoryPageLoad(socket, command, conf
70
71
  const resolved = await resolveSessionDirectories(directories, config.bindingId, command.directoryId, command.additionalDirectoryIds, signal);
71
72
  const replay = await sessions.previewNativeSessionEventsV2({
72
73
  additionalDirectories: resolved.additionalDirectories,
73
- agent: config.catalog.find(command.agentId),
74
+ agent: await resolveCatalogAgent(config, command.agentId, signal),
74
75
  cwd: resolved.cwd,
75
76
  sessionId: command.sessionId,
76
77
  signal,
@@ -1 +1 @@
1
- {"version":3,"file":"daemon-history-commands.js","sourceRoot":"","sources":["../src/daemon-history-commands.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"daemon-history-commands.js","sourceRoot":"","sources":["../src/daemon-history-commands.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"daemon-prompt-executor.d.ts","sourceRoot":"","sources":["../src/daemon-prompt-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,wBAAwB,EAExB,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EAE5B,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAqB,KAAK,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAM7F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wCAAwC,CAAC;AACxF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAIhD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8CAA8C,CAAC;AACzF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAsBzE,MAAM,WAAW,oBAAoB;IACjC,QAAQ,CAAC,UAAU,EAAE,oBAAoB,CAAC;IAC1C,QAAQ,CAAC,UAAU,EAAE,uBAAuB,CAAC;IAC7C,QAAQ,CAAC,OAAO,EAAE,oBAAoB,CAAC;IACvC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,WAAW,EAAE,yBAAyB,CAAC;IAChD,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,mBAAmB,CAAC;IACvC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,eAAe,EAAE,MAAM;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAA;KAAE,CAAC;IACjF,QAAQ,CAAC,0BAA0B,EAAE,CACjC,MAAM,EAAE,WAAW,KAClB,OAAO,CACN;QAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;QAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;KAAE,GAC5D;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GACzB;QAAE,QAAQ,CAAC,IAAI,EAAE,0BAA0B,CAAA;KAAE,CAClD,CAAC;IACF,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,eAAe,EAAE,CACtB,KAAK,EACC;QAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,wBAAwB,CAAC;QAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GACrG,OAAO,CAAC,oBAAoB,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,wBAAwB,CAAA;KAAE,CAAC,KACtF,oBAAoB,CAAC;IAC1B,QAAQ,CAAC,oBAAoB,EAAE,MAAM,OAAO,CAAC;IAC7C,QAAQ,CAAC,qBAAqB,EAAE,MAAM,OAAO,CAAC;CACjD;AAED,wBAAsB,aAAa,CAAC,EAChC,UAAU,EACV,UAAU,EACV,OAAO,EACP,MAAM,EACN,WAAW,EACX,KAAK,EACL,QAAQ,EACR,SAAS,EACT,eAAe,EACf,0BAA0B,EAC1B,MAAM,EACN,eAAe,EACf,oBAAoB,EACpB,qBAAqB,GACxB,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmKtC"}
1
+ {"version":3,"file":"daemon-prompt-executor.d.ts","sourceRoot":"","sources":["../src/daemon-prompt-executor.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,wBAAwB,EAExB,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EAE5B,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAqB,KAAK,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAM7F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wCAAwC,CAAC;AACxF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAKhD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8CAA8C,CAAC;AACzF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAsBzE,MAAM,WAAW,oBAAoB;IACjC,QAAQ,CAAC,UAAU,EAAE,oBAAoB,CAAC;IAC1C,QAAQ,CAAC,UAAU,EAAE,uBAAuB,CAAC;IAC7C,QAAQ,CAAC,OAAO,EAAE,oBAAoB,CAAC;IACvC,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,QAAQ,CAAC,WAAW,EAAE,yBAAyB,CAAC;IAChD,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,mBAAmB,CAAC;IACvC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,eAAe,EAAE,MAAM;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAA;KAAE,CAAC;IACjF,QAAQ,CAAC,0BAA0B,EAAE,CACjC,MAAM,EAAE,WAAW,KAClB,OAAO,CACN;QAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;QAAC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;KAAE,GAC5D;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GACzB;QAAE,QAAQ,CAAC,IAAI,EAAE,0BAA0B,CAAA;KAAE,CAClD,CAAC;IACF,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,eAAe,EAAE,CACtB,KAAK,EACC;QAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,wBAAwB,CAAC;QAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GACrG,OAAO,CAAC,oBAAoB,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,wBAAwB,CAAA;KAAE,CAAC,KACtF,oBAAoB,CAAC;IAC1B,QAAQ,CAAC,oBAAoB,EAAE,MAAM,OAAO,CAAC;IAC7C,QAAQ,CAAC,qBAAqB,EAAE,MAAM,OAAO,CAAC;CACjD;AAED,wBAAsB,aAAa,CAAC,EAChC,UAAU,EACV,UAAU,EACV,OAAO,EACP,MAAM,EACN,WAAW,EACX,KAAK,EACL,QAAQ,EACR,SAAS,EACT,eAAe,EACf,0BAA0B,EAC1B,MAAM,EACN,eAAe,EACf,oBAAoB,EACpB,qBAAqB,GACxB,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmKtC"}
@@ -3,6 +3,7 @@ import { AcpExecutionError } from "./acp/agent-runtime-manager.js";
3
3
  import { agentForSessionConfiguration, applyCompleteSessionConfiguration, assertAppliedSessionConfiguration, } from "./acp/session-config/apply-session-configuration.js";
4
4
  import { resolveSessionDirectories } from "./authorization/resolve-session-directories.js";
5
5
  import { operationErrorCode, operationErrorMessage } from "./daemon-command-results.js";
6
+ import { resolveCatalogAgent } from "./daemon-session-commands.js";
6
7
  import { resolvePromptArtifacts } from "./prompt-artifact-resolver.js";
7
8
  function daemonActivity(command, activity) {
8
9
  return {
@@ -26,7 +27,7 @@ function daemonActivity(command, activity) {
26
27
  export async function executePrompt({ operations, eventLogV2, command, config, directories, audit, sessions, attemptId, activateAttempt, waitForSessionAvailability, signal, recordTurnEvent, recordSteeringPrompt, cancellationRequested, }) {
27
28
  try {
28
29
  const resolved = await resolveSessionDirectories(directories, command.bindingId, command.directoryId, command.additionalDirectoryIds, signal);
29
- const agent = config.catalog.find(command.agentId);
30
+ const agent = await resolveCatalogAgent(config, command.agentId, signal);
30
31
  const availability = await waitForSessionAvailability(signal);
31
32
  if (availability.kind === "busy") {
32
33
  throw new AcpExecutionError("Another prompt is already running in this conversation", {}, "session_busy");
@@ -1 +1 @@
1
- {"version":3,"file":"daemon-prompt-executor.js","sourceRoot":"","sources":["../src/daemon-prompt-executor.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"daemon-prompt-executor.js","sourceRoot":"","sources":["../src/daemon-prompt-executor.ts"],"names":[],"mappings":"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"}
@@ -3,9 +3,10 @@ import type { WebSocket } from "undici";
3
3
  import type { AgentRuntimeManager } from "./acp/agent-runtime-manager.ts";
4
4
  import type { AuditStore } from "./audit/audit-store.ts";
5
5
  import type { WorkspaceDirectoryService } from "./authorization/workspace-directory.ts";
6
- import type { DaemonConfig } from "./config.ts";
6
+ import type { AcpAgentDefinition, DaemonConfig } from "./config.ts";
7
7
  import type { NativeSessionService } from "./native-sessions/service.ts";
8
8
  import type { RelayConnectionDiagnostics } from "./relay-connection/diagnostics.ts";
9
+ export declare function resolveCatalogAgent(config: DaemonConfig, agentId: string, signal: AbortSignal): Promise<AcpAgentDefinition>;
9
10
  export declare function executeWorkspaceList(socket: WebSocket, command: WorkspaceListCommand, directories: WorkspaceDirectoryService, audit: AuditStore, signal: AbortSignal): Promise<void>;
10
11
  export declare function executeSessionPrepare(socket: WebSocket, command: SessionPrepareCommand, config: DaemonConfig, directories: WorkspaceDirectoryService, audit: AuditStore, sessions: AgentRuntimeManager, diagnostics: RelayConnectionDiagnostics, signal: AbortSignal): Promise<void>;
11
12
  export declare function executeSessionRestore(socket: WebSocket, command: SessionRestoreCommand, config: DaemonConfig, directories: WorkspaceDirectoryService, audit: AuditStore, sessions: AgentRuntimeManager, nativeSessions: NativeSessionService, diagnostics: RelayConnectionDiagnostics, signal: AbortSignal): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"daemon-session-commands.d.ts","sourceRoot":"","sources":["../src/daemon-session-commands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,uBAAuB,EACvB,qBAAqB,EAErB,qBAAqB,EACrB,oBAAoB,EACvB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,KAAK,EAAsB,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAC9F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wCAAwC,CAAC;AACxF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAwFpF,wBAAsB,oBAAoB,CACtC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,oBAAoB,EAC7B,WAAW,EAAE,yBAAyB,EACtC,KAAK,EAAE,UAAU,EACjB,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,IAAI,CAAC,CAoBf;AAED,wBAAsB,qBAAqB,CACvC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,qBAAqB,EAC9B,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,yBAAyB,EACtC,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,mBAAmB,EAC7B,WAAW,EAAE,0BAA0B,EACvC,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,IAAI,CAAC,CAuCf;AAED,wBAAsB,qBAAqB,CACvC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,qBAAqB,EAC9B,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,yBAAyB,EACtC,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,mBAAmB,EAC7B,cAAc,EAAE,oBAAoB,EACpC,WAAW,EAAE,0BAA0B,EACvC,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,IAAI,CAAC,CAqDf;AAED,wBAAsB,uBAAuB,CACzC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,uBAAuB,EAChC,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,yBAAyB,EACtC,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,mBAAmB,EAC7B,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,IAAI,CAAC,CAsCf"}
1
+ {"version":3,"file":"daemon-session-commands.d.ts","sourceRoot":"","sources":["../src/daemon-session-commands.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,uBAAuB,EACvB,qBAAqB,EAErB,qBAAqB,EACrB,oBAAoB,EACvB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,KAAK,EAAsB,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAC9F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wCAAwC,CAAC;AACxF,OAAO,KAAK,EAAE,kBAAkB,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGpE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAC;AAEpF,wBAAsB,mBAAmB,CACrC,MAAM,EAAE,YAAY,EACpB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,kBAAkB,CAAC,CAG7B;AAwFD,wBAAsB,oBAAoB,CACtC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,oBAAoB,EAC7B,WAAW,EAAE,yBAAyB,EACtC,KAAK,EAAE,UAAU,EACjB,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,IAAI,CAAC,CAoBf;AAED,wBAAsB,qBAAqB,CACvC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,qBAAqB,EAC9B,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,yBAAyB,EACtC,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,mBAAmB,EAC7B,WAAW,EAAE,0BAA0B,EACvC,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,IAAI,CAAC,CAuCf;AAED,wBAAsB,qBAAqB,CACvC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,qBAAqB,EAC9B,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,yBAAyB,EACtC,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,mBAAmB,EAC7B,cAAc,EAAE,oBAAoB,EACpC,WAAW,EAAE,0BAA0B,EACvC,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,IAAI,CAAC,CAqDf;AAED,wBAAsB,uBAAuB,CACzC,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,uBAAuB,EAChC,MAAM,EAAE,YAAY,EACpB,WAAW,EAAE,yBAAyB,EACtC,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,mBAAmB,EAC7B,MAAM,EAAE,WAAW,GACpB,OAAO,CAAC,IAAI,CAAC,CAsCf"}
@@ -2,10 +2,14 @@ import { AcpExecutionError } from "./acp/acp-error.js";
2
2
  import { resolveSessionDirectories } from "./authorization/resolve-session-directories.js";
3
3
  import { operationErrorCode, reportOperationFailure, send } from "./daemon-command-results.js";
4
4
  import { AccumulatingOperationMetrics } from "./infra/operation-metrics.js";
5
+ export async function resolveCatalogAgent(config, agentId, signal) {
6
+ const agent = config.catalog.find(agentId);
7
+ return config.resolveAgent === undefined ? agent : await config.resolveAgent(agent, signal);
8
+ }
5
9
  async function prepareSession(command, recovery, config, directories, audit, sessions, metrics, signal) {
6
10
  return await metrics.measure("prepare-total", async () => {
7
11
  const resolved = await metrics.measure("workspace-resolve", async () => await resolveSessionDirectories(directories, config.bindingId, command.directoryId, command.additionalDirectoryIds, signal));
8
- const agent = config.catalog.find(command.agentId);
12
+ const agent = await resolveCatalogAgent(config, command.agentId, signal);
9
13
  const preparation = {
10
14
  additionalDirectories: resolved.additionalDirectories,
11
15
  agent,
@@ -154,7 +158,7 @@ export async function executeSessionConfigure(socket, command, config, directori
154
158
  const resolved = await resolveSessionDirectories(directories, config.bindingId, command.directoryId, command.additionalDirectoryIds, signal);
155
159
  const configOptions = await sessions.configureSession({
156
160
  additionalDirectories: resolved.additionalDirectories,
157
- agent: config.catalog.find(command.agentId),
161
+ agent: await resolveCatalogAgent(config, command.agentId, signal),
158
162
  booleanValue: command.booleanValue,
159
163
  configId: command.configId,
160
164
  cwd: resolved.cwd,
@@ -1 +1 @@
1
- {"version":3,"file":"daemon-session-commands.js","sourceRoot":"","sources":["../src/daemon-session-commands.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"daemon-session-commands.js","sourceRoot":"","sources":["../src/daemon-session-commands.ts"],"names":[],"mappings":"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"}