@openrig/cli 0.1.5 → 0.1.7
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/daemon/dist/adapters/claude-resume.js +1 -1
- package/daemon/dist/adapters/cmux-transport.d.ts.map +1 -1
- package/daemon/dist/adapters/cmux-transport.js +40 -3
- package/daemon/dist/adapters/cmux-transport.js.map +1 -1
- package/daemon/dist/adapters/cmux.d.ts +4 -2
- package/daemon/dist/adapters/cmux.d.ts.map +1 -1
- package/daemon/dist/adapters/cmux.js +90 -11
- package/daemon/dist/adapters/cmux.js.map +1 -1
- package/daemon/dist/adapters/compose-services-adapter.d.ts +73 -0
- package/daemon/dist/adapters/compose-services-adapter.d.ts.map +1 -0
- package/daemon/dist/adapters/compose-services-adapter.js +195 -0
- package/daemon/dist/adapters/compose-services-adapter.js.map +1 -0
- package/daemon/dist/adapters/tmux-exec.d.ts.map +1 -1
- package/daemon/dist/adapters/tmux-exec.js +22 -2
- package/daemon/dist/adapters/tmux-exec.js.map +1 -1
- package/daemon/dist/db/migrations/020_rig_services.d.ts +3 -0
- package/daemon/dist/db/migrations/020_rig_services.d.ts.map +1 -0
- package/daemon/dist/db/migrations/020_rig_services.js +17 -0
- package/daemon/dist/db/migrations/020_rig_services.js.map +1 -0
- package/daemon/dist/domain/bootstrap-orchestrator.d.ts +7 -0
- package/daemon/dist/domain/bootstrap-orchestrator.d.ts.map +1 -1
- package/daemon/dist/domain/bootstrap-orchestrator.js +73 -1
- package/daemon/dist/domain/bootstrap-orchestrator.js.map +1 -1
- package/daemon/dist/domain/compose-project-name.d.ts +3 -0
- package/daemon/dist/domain/compose-project-name.d.ts.map +1 -0
- package/daemon/dist/domain/compose-project-name.js +16 -0
- package/daemon/dist/domain/compose-project-name.js.map +1 -0
- package/daemon/dist/domain/native-resume-probe.js +5 -2
- package/daemon/dist/domain/native-resume-probe.js.map +1 -1
- package/daemon/dist/domain/node-cmux-service.d.ts +19 -0
- package/daemon/dist/domain/node-cmux-service.d.ts.map +1 -0
- package/daemon/dist/domain/node-cmux-service.js +75 -0
- package/daemon/dist/domain/node-cmux-service.js.map +1 -0
- package/daemon/dist/domain/node-inventory.js +1 -1
- package/daemon/dist/domain/node-inventory.js.map +1 -1
- package/daemon/dist/domain/restore-orchestrator.d.ts +2 -0
- package/daemon/dist/domain/restore-orchestrator.d.ts.map +1 -1
- package/daemon/dist/domain/restore-orchestrator.js +13 -0
- package/daemon/dist/domain/restore-orchestrator.js.map +1 -1
- package/daemon/dist/domain/rig-repository.d.ts +6 -1
- package/daemon/dist/domain/rig-repository.d.ts.map +1 -1
- package/daemon/dist/domain/rig-repository.js +65 -0
- package/daemon/dist/domain/rig-repository.js.map +1 -1
- package/daemon/dist/domain/rig-teardown.d.ts +1 -0
- package/daemon/dist/domain/rig-teardown.d.ts.map +1 -1
- package/daemon/dist/domain/rig-teardown.js +17 -0
- package/daemon/dist/domain/rig-teardown.js.map +1 -1
- package/daemon/dist/domain/rigspec-instantiator.d.ts +7 -0
- package/daemon/dist/domain/rigspec-instantiator.d.ts.map +1 -1
- package/daemon/dist/domain/rigspec-instantiator.js +7 -0
- package/daemon/dist/domain/rigspec-instantiator.js.map +1 -1
- package/daemon/dist/domain/rigspec-schema.d.ts.map +1 -1
- package/daemon/dist/domain/rigspec-schema.js +200 -0
- package/daemon/dist/domain/rigspec-schema.js.map +1 -1
- package/daemon/dist/domain/service-orchestrator.d.ts +59 -0
- package/daemon/dist/domain/service-orchestrator.d.ts.map +1 -0
- package/daemon/dist/domain/service-orchestrator.js +172 -0
- package/daemon/dist/domain/service-orchestrator.js.map +1 -0
- package/daemon/dist/domain/services-readiness.d.ts +23 -0
- package/daemon/dist/domain/services-readiness.d.ts.map +1 -0
- package/daemon/dist/domain/services-readiness.js +63 -0
- package/daemon/dist/domain/services-readiness.js.map +1 -0
- package/daemon/dist/domain/snapshot-capture.d.ts.map +1 -1
- package/daemon/dist/domain/snapshot-capture.js +10 -0
- package/daemon/dist/domain/snapshot-capture.js.map +1 -1
- package/daemon/dist/domain/spec-library-service.d.ts +1 -0
- package/daemon/dist/domain/spec-library-service.d.ts.map +1 -1
- package/daemon/dist/domain/spec-library-service.js +7 -0
- package/daemon/dist/domain/spec-library-service.js.map +1 -1
- package/daemon/dist/domain/spec-review-service.d.ts +29 -0
- package/daemon/dist/domain/spec-review-service.d.ts.map +1 -1
- package/daemon/dist/domain/spec-review-service.js +26 -0
- package/daemon/dist/domain/spec-review-service.js.map +1 -1
- package/daemon/dist/domain/types.d.ts +83 -0
- package/daemon/dist/domain/types.d.ts.map +1 -1
- package/daemon/dist/openrig-compat.d.ts.map +1 -1
- package/daemon/dist/openrig-compat.js +4 -1
- package/daemon/dist/openrig-compat.js.map +1 -1
- package/daemon/dist/routes/adapters.js +3 -2
- package/daemon/dist/routes/adapters.js.map +1 -1
- package/daemon/dist/routes/env.d.ts +3 -0
- package/daemon/dist/routes/env.d.ts.map +1 -0
- package/daemon/dist/routes/env.js +119 -0
- package/daemon/dist/routes/env.js.map +1 -0
- package/daemon/dist/routes/sessions.d.ts.map +1 -1
- package/daemon/dist/routes/sessions.js +14 -0
- package/daemon/dist/routes/sessions.js.map +1 -1
- package/daemon/dist/routes/spec-library.d.ts.map +1 -1
- package/daemon/dist/routes/spec-library.js +21 -0
- package/daemon/dist/routes/spec-library.js.map +1 -1
- package/daemon/dist/server.d.ts +3 -0
- package/daemon/dist/server.d.ts.map +1 -1
- package/daemon/dist/server.js +5 -0
- package/daemon/dist/server.js.map +1 -1
- package/daemon/dist/startup.d.ts.map +1 -1
- package/daemon/dist/startup.js +15 -3
- package/daemon/dist/startup.js.map +1 -1
- package/daemon/specs/agents/apps/vault-specialist/agent.yaml +36 -0
- package/daemon/specs/agents/apps/vault-specialist/guidance/role.md +34 -0
- package/daemon/specs/agents/apps/vault-specialist/skills/vault-user/SKILL.md +64 -0
- package/daemon/specs/agents/apps/vault-specialist/startup/context.md +46 -0
- package/daemon/specs/agents/development/implementer/agent.yaml +1 -1
- package/daemon/specs/agents/development/implementer/guidance/role.md +1 -0
- package/daemon/specs/agents/orchestration/orchestrator/agent.yaml +1 -1
- package/daemon/specs/agents/orchestration/orchestrator/guidance/role.md +1 -0
- package/daemon/specs/agents/shared/agent.yaml +2 -0
- package/daemon/specs/agents/shared/skills/core/openrig-user/SKILL.md +53 -2
- package/daemon/specs/agents/shared/skills/mental-model-ha/SKILL.md +953 -0
- package/daemon/specs/rigs/launch/secrets-manager/rig.yaml +37 -0
- package/daemon/specs/rigs/launch/secrets-manager/secrets-manager.compose.yaml +18 -0
- package/dist/commands/destroy.d.ts +9 -0
- package/dist/commands/destroy.d.ts.map +1 -0
- package/dist/commands/destroy.js +175 -0
- package/dist/commands/destroy.js.map +1 -0
- package/dist/commands/doctor.d.ts +1 -0
- package/dist/commands/doctor.d.ts.map +1 -1
- package/dist/commands/doctor.js +82 -7
- package/dist/commands/doctor.js.map +1 -1
- package/dist/commands/down.d.ts.map +1 -1
- package/dist/commands/down.js +2 -1
- package/dist/commands/down.js.map +1 -1
- package/dist/commands/env.d.ts +4 -0
- package/dist/commands/env.d.ts.map +1 -0
- package/dist/commands/env.js +139 -0
- package/dist/commands/env.js.map +1 -0
- package/dist/commands/restore.d.ts.map +1 -1
- package/dist/commands/restore.js +2 -1
- package/dist/commands/restore.js.map +1 -1
- package/dist/commands/specs.d.ts.map +1 -1
- package/dist/commands/specs.js +11 -4
- package/dist/commands/specs.js.map +1 -1
- package/dist/commands/up.d.ts.map +1 -1
- package/dist/commands/up.js +9 -2
- package/dist/commands/up.js.map +1 -1
- package/dist/destroy-helpers.d.ts +63 -0
- package/dist/destroy-helpers.d.ts.map +1 -0
- package/dist/destroy-helpers.js +224 -0
- package/dist/destroy-helpers.js.map +1 -0
- package/dist/index.d.ts +3 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -0
- package/dist/index.js.map +1 -1
- package/dist/openrig-compat.d.ts.map +1 -1
- package/dist/openrig-compat.js +4 -1
- package/dist/openrig-compat.js.map +1 -1
- package/package.json +1 -1
- package/ui/dist/assets/index-BsXbqPEl.css +1 -0
- package/ui/dist/assets/index-CXZYxZbF.js +225 -0
- package/ui/dist/index.html +2 -2
- package/ui/dist/assets/index-DGPFTQEV.css +0 -1
- package/ui/dist/assets/index-VA_A8dpm.js +0 -224
|
@@ -38,7 +38,7 @@ export class ClaudeResumeAdapter {
|
|
|
38
38
|
}
|
|
39
39
|
async verifyResume(tmuxSessionName) {
|
|
40
40
|
const pollMs = this.options.pollMs ?? 200;
|
|
41
|
-
const maxWaitMs = this.options.maxWaitMs ??
|
|
41
|
+
const maxWaitMs = this.options.maxWaitMs ?? 5_000;
|
|
42
42
|
const sleepFn = this.options.sleep ?? sleep;
|
|
43
43
|
const attempts = Math.max(1, Math.floor(maxWaitMs / Math.max(pollMs, 1)) + 1);
|
|
44
44
|
for (let attempt = 0; attempt < attempts; attempt++) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cmux-transport.d.ts","sourceRoot":"","sources":["../../src/adapters/cmux-transport.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACrE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"cmux-transport.d.ts","sourceRoot":"","sources":["../../src/adapters/cmux-transport.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,oBAAoB,EAAE,MAAM,WAAW,CAAC;AACrE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAyDxC;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,oBAAoB,CAkCzE"}
|
|
@@ -17,16 +17,27 @@ function buildCommand(method, params) {
|
|
|
17
17
|
const mapped = METHOD_MAP[method];
|
|
18
18
|
if (mapped)
|
|
19
19
|
return mapped;
|
|
20
|
-
// Parameterized commands
|
|
20
|
+
// Parameterized commands — modern cmux CLI shape
|
|
21
|
+
if (method === "workspace.current") {
|
|
22
|
+
return { cmd: "cmux current-workspace --json", json: true };
|
|
23
|
+
}
|
|
24
|
+
if (method === "surface.create" && params?.workspaceId) {
|
|
25
|
+
return {
|
|
26
|
+
cmd: `cmux new-surface --type ${shellQuote(String(params.type ?? "terminal"))} --workspace ${shellQuote(String(params.workspaceId))} --json`,
|
|
27
|
+
json: true,
|
|
28
|
+
};
|
|
29
|
+
}
|
|
21
30
|
if (method === "surface.focus" && params?.surfaceId) {
|
|
31
|
+
const workspaceArg = params.workspaceId ? ` --workspace ${shellQuote(String(params.workspaceId))}` : "";
|
|
22
32
|
return {
|
|
23
|
-
cmd: `cmux focus-
|
|
33
|
+
cmd: `cmux focus-panel --panel ${shellQuote(String(params.surfaceId))}${workspaceArg}`,
|
|
24
34
|
json: false,
|
|
25
35
|
};
|
|
26
36
|
}
|
|
27
37
|
if (method === "surface.sendText" && params?.surfaceId && params?.text != null) {
|
|
38
|
+
const workspaceArg = params.workspaceId ? ` --workspace ${shellQuote(String(params.workspaceId))}` : "";
|
|
28
39
|
return {
|
|
29
|
-
cmd: `cmux send
|
|
40
|
+
cmd: `cmux send --surface ${shellQuote(String(params.surfaceId))}${workspaceArg} ${shellQuote(String(params.text))}`,
|
|
30
41
|
json: false,
|
|
31
42
|
};
|
|
32
43
|
}
|
|
@@ -50,6 +61,10 @@ export function createCmuxCliTransport(exec) {
|
|
|
50
61
|
return JSON.parse(output);
|
|
51
62
|
}
|
|
52
63
|
catch {
|
|
64
|
+
const legacyFallback = legacyJsonFallback(method, output);
|
|
65
|
+
if (legacyFallback !== null) {
|
|
66
|
+
return legacyFallback;
|
|
67
|
+
}
|
|
53
68
|
throw new Error(`Failed to parse JSON from cmux command '${cmd}': ${output.slice(0, 200)}`);
|
|
54
69
|
}
|
|
55
70
|
}
|
|
@@ -61,4 +76,26 @@ export function createCmuxCliTransport(exec) {
|
|
|
61
76
|
};
|
|
62
77
|
};
|
|
63
78
|
}
|
|
79
|
+
function legacyJsonFallback(method, output) {
|
|
80
|
+
const trimmed = output.trim();
|
|
81
|
+
if (!trimmed)
|
|
82
|
+
return null;
|
|
83
|
+
// cmux 0.61.x can still return a bare handle for some --json commands.
|
|
84
|
+
if (method === "workspace.current") {
|
|
85
|
+
return { workspace_id: trimmed };
|
|
86
|
+
}
|
|
87
|
+
if (method === "surface.create") {
|
|
88
|
+
const summary = trimmed.replace(/^OK\s+/, "");
|
|
89
|
+
const refMatch = summary.match(/(?:^|\s)(surface:[^\s]+)/);
|
|
90
|
+
if (refMatch) {
|
|
91
|
+
return { created_surface_ref: refMatch[1] };
|
|
92
|
+
}
|
|
93
|
+
const firstToken = summary.split(/\s+/)[0];
|
|
94
|
+
if (firstToken) {
|
|
95
|
+
return { created_surface_ref: firstToken };
|
|
96
|
+
}
|
|
97
|
+
return null;
|
|
98
|
+
}
|
|
99
|
+
return null;
|
|
100
|
+
}
|
|
64
101
|
//# sourceMappingURL=cmux-transport.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cmux-transport.js","sourceRoot":"","sources":["../../src/adapters/cmux-transport.ts"],"names":[],"mappings":"AAGA,6DAA6D;AAC7D,SAAS,UAAU,CAAC,CAAS;IAC3B,OAAO,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,GAAG,CAAC;AAChD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,GAAmD;IACjE,YAAY,EAAE,EAAE,GAAG,EAAE,0BAA0B,EAAE,IAAI,EAAE,IAAI,EAAE;IAC7D,gBAAgB,EAAE,EAAE,GAAG,EAAE,6BAA6B,EAAE,IAAI,EAAE,IAAI,EAAE;IACpE,cAAc,EAAE,EAAE,GAAG,EAAE,2BAA2B,EAAE,IAAI,EAAE,IAAI,EAAE;IAChE,qBAAqB,EAAE,EAAE,GAAG,EAAE,wBAAwB,EAAE,IAAI,EAAE,IAAI,EAAE;CACrE,CAAC;AAEF,SAAS,YAAY,CACnB,MAAc,EACd,MAAgC;IAEhC,8BAA8B;IAC9B,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;IAClC,IAAI,MAAM;QAAE,OAAO,MAAM,CAAC;IAE1B,
|
|
1
|
+
{"version":3,"file":"cmux-transport.js","sourceRoot":"","sources":["../../src/adapters/cmux-transport.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,8 +38,10 @@ export declare class CmuxAdapter {
|
|
|
38
38
|
isAvailable(): boolean;
|
|
39
39
|
listWorkspaces(): Promise<CmuxResult<CmuxWorkspace[]>>;
|
|
40
40
|
listSurfaces(workspaceId?: string): Promise<CmuxResult<CmuxSurface[]>>;
|
|
41
|
-
focusSurface(surfaceId: string): Promise<CmuxResult<void>>;
|
|
42
|
-
sendText(surfaceId: string, text: string): Promise<CmuxResult<void>>;
|
|
41
|
+
focusSurface(surfaceId: string, workspaceId?: string): Promise<CmuxResult<void>>;
|
|
42
|
+
sendText(surfaceId: string, text: string, workspaceId?: string): Promise<CmuxResult<void>>;
|
|
43
|
+
currentWorkspace(): Promise<CmuxResult<string>>;
|
|
44
|
+
createTerminalSurface(workspaceId: string): Promise<CmuxResult<string>>;
|
|
43
45
|
/** Query cmux for agent PIDs (sidebar metadata). Returns Map<pid, { runtime, pid }>. */
|
|
44
46
|
queryAgentPIDs(): Promise<CmuxResult<Map<number, {
|
|
45
47
|
runtime: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cmux.d.ts","sourceRoot":"","sources":["../../src/adapters/cmux.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5D,KAAK,IAAI,IAAI,CAAC;CACf;AAED,MAAM,MAAM,oBAAoB,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC;AAEhE,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACvC;AAED,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,UAAU,CAAC,CAAC,IACpB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,CAAC,CAAA;CAAE,GACrB;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjD,UAAU,kBAAkB;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,qBAAa,WAAW;IAKpB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;IALjB,OAAO,CAAC,MAAM,CAAsD;IACpE,SAAS,CAAC,SAAS,EAAE,aAAa,GAAG,IAAI,CAAQ;gBAGvC,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,kBAAkB;IAG/B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"cmux.d.ts","sourceRoot":"","sources":["../../src/adapters/cmux.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5D,KAAK,IAAI,IAAI,CAAC;CACf;AAED,MAAM,MAAM,oBAAoB,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC;AAEhE,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACvC;AAED,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,UAAU,CAAC,CAAC,IACpB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,CAAC,CAAA;CAAE,GACrB;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjD,UAAU,kBAAkB;IAC1B,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,qBAAa,WAAW;IAKpB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;IALjB,OAAO,CAAC,MAAM,CAAsD;IACpE,SAAS,CAAC,SAAS,EAAE,aAAa,GAAG,IAAI,CAAQ;gBAGvC,OAAO,EAAE,oBAAoB,EAC7B,OAAO,EAAE,kBAAkB;IAG/B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IA8C9B,SAAS,IAAI,UAAU;IAIvB,WAAW,IAAI,OAAO;IAIhB,cAAc,IAAI,OAAO,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC,CAAC;IActD,YAAY,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,CAAC;IAetE,YAAY,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAYhF,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAY1F,gBAAgB,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAgB/C,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAwB7E,wFAAwF;IAClF,cAAc,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,CAAC;CAmB3F"}
|
|
@@ -26,13 +26,8 @@ export class CmuxAdapter {
|
|
|
26
26
|
try {
|
|
27
27
|
const { transport, capabilities } = await withTimeout((async () => {
|
|
28
28
|
holder.transport = await this.factory();
|
|
29
|
-
const result =
|
|
30
|
-
const caps =
|
|
31
|
-
if (result.capabilities) {
|
|
32
|
-
for (const cap of result.capabilities) {
|
|
33
|
-
caps[cap] = true;
|
|
34
|
-
}
|
|
35
|
-
}
|
|
29
|
+
const result = await holder.transport.request("capabilities");
|
|
30
|
+
const caps = normalizeCapabilities(result);
|
|
36
31
|
return { transport: holder.transport, capabilities: caps };
|
|
37
32
|
})(), this.options.timeoutMs);
|
|
38
33
|
this.transport = transport;
|
|
@@ -83,30 +78,70 @@ export class CmuxAdapter {
|
|
|
83
78
|
return { ok: false, code: "request_failed", message: err instanceof Error ? err.message : String(err) };
|
|
84
79
|
}
|
|
85
80
|
}
|
|
86
|
-
async focusSurface(surfaceId) {
|
|
81
|
+
async focusSurface(surfaceId, workspaceId) {
|
|
87
82
|
if (!this.transport) {
|
|
88
83
|
return { ok: false, code: "unavailable", message: "cmux is not connected" };
|
|
89
84
|
}
|
|
90
85
|
try {
|
|
91
|
-
await this.transport.request("surface.focus", { surfaceId });
|
|
86
|
+
await this.transport.request("surface.focus", { surfaceId, workspaceId });
|
|
92
87
|
return { ok: true, data: undefined };
|
|
93
88
|
}
|
|
94
89
|
catch (err) {
|
|
95
90
|
return { ok: false, code: "request_failed", message: err instanceof Error ? err.message : String(err) };
|
|
96
91
|
}
|
|
97
92
|
}
|
|
98
|
-
async sendText(surfaceId, text) {
|
|
93
|
+
async sendText(surfaceId, text, workspaceId) {
|
|
99
94
|
if (!this.transport) {
|
|
100
95
|
return { ok: false, code: "unavailable", message: "cmux is not connected" };
|
|
101
96
|
}
|
|
102
97
|
try {
|
|
103
|
-
await this.transport.request("surface.sendText", { surfaceId, text });
|
|
98
|
+
await this.transport.request("surface.sendText", { surfaceId, text, workspaceId });
|
|
104
99
|
return { ok: true, data: undefined };
|
|
105
100
|
}
|
|
106
101
|
catch (err) {
|
|
107
102
|
return { ok: false, code: "request_failed", message: err instanceof Error ? err.message : String(err) };
|
|
108
103
|
}
|
|
109
104
|
}
|
|
105
|
+
async currentWorkspace() {
|
|
106
|
+
if (!this.transport) {
|
|
107
|
+
return { ok: false, code: "unavailable", message: "cmux is not connected" };
|
|
108
|
+
}
|
|
109
|
+
try {
|
|
110
|
+
const raw = (await this.transport.request("workspace.current"));
|
|
111
|
+
const handle = normalizeHandle("workspace", raw["workspace_id"] ?? raw["id"]);
|
|
112
|
+
if (!handle) {
|
|
113
|
+
return { ok: false, code: "request_failed", message: "cmux current-workspace returned no workspace handle" };
|
|
114
|
+
}
|
|
115
|
+
return { ok: true, data: handle };
|
|
116
|
+
}
|
|
117
|
+
catch (err) {
|
|
118
|
+
return { ok: false, code: "request_failed", message: err instanceof Error ? err.message : String(err) };
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
async createTerminalSurface(workspaceId) {
|
|
122
|
+
if (!this.transport) {
|
|
123
|
+
return { ok: false, code: "unavailable", message: "cmux is not connected" };
|
|
124
|
+
}
|
|
125
|
+
try {
|
|
126
|
+
const raw = (await this.transport.request("surface.create", { workspaceId, type: "terminal" }));
|
|
127
|
+
const handle = [
|
|
128
|
+
raw["created_surface_ref"],
|
|
129
|
+
raw["created_surface_id"],
|
|
130
|
+
raw["surface_ref"],
|
|
131
|
+
raw["surface_id"],
|
|
132
|
+
raw["id"],
|
|
133
|
+
]
|
|
134
|
+
.map((value) => normalizeHandle("surface", value))
|
|
135
|
+
.find((value) => Boolean(value));
|
|
136
|
+
if (!handle) {
|
|
137
|
+
return { ok: false, code: "request_failed", message: "cmux new-surface returned no surface handle" };
|
|
138
|
+
}
|
|
139
|
+
return { ok: true, data: handle };
|
|
140
|
+
}
|
|
141
|
+
catch (err) {
|
|
142
|
+
return { ok: false, code: "request_failed", message: err instanceof Error ? err.message : String(err) };
|
|
143
|
+
}
|
|
144
|
+
}
|
|
110
145
|
/** Query cmux for agent PIDs (sidebar metadata). Returns Map<pid, { runtime, pid }>. */
|
|
111
146
|
async queryAgentPIDs() {
|
|
112
147
|
if (!this.transport) {
|
|
@@ -127,6 +162,50 @@ export class CmuxAdapter {
|
|
|
127
162
|
}
|
|
128
163
|
}
|
|
129
164
|
}
|
|
165
|
+
function normalizeCapabilities(raw) {
|
|
166
|
+
const caps = {};
|
|
167
|
+
if (Array.isArray(raw)) {
|
|
168
|
+
for (const cap of raw) {
|
|
169
|
+
if (typeof cap === "string" && cap.trim() !== "") {
|
|
170
|
+
caps[cap] = true;
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
return caps;
|
|
174
|
+
}
|
|
175
|
+
if (!raw || typeof raw !== "object") {
|
|
176
|
+
return caps;
|
|
177
|
+
}
|
|
178
|
+
const record = raw;
|
|
179
|
+
const nested = record["capabilities"];
|
|
180
|
+
if (Array.isArray(nested)) {
|
|
181
|
+
for (const cap of nested) {
|
|
182
|
+
if (typeof cap === "string" && cap.trim() !== "") {
|
|
183
|
+
caps[cap] = true;
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
return caps;
|
|
187
|
+
}
|
|
188
|
+
for (const [key, value] of Object.entries(record)) {
|
|
189
|
+
if (value === false || value == null)
|
|
190
|
+
continue;
|
|
191
|
+
caps[key] = true;
|
|
192
|
+
}
|
|
193
|
+
return caps;
|
|
194
|
+
}
|
|
195
|
+
function normalizeHandle(kind, value) {
|
|
196
|
+
if (typeof value !== "string")
|
|
197
|
+
return undefined;
|
|
198
|
+
const trimmed = value.trim();
|
|
199
|
+
if (!trimmed)
|
|
200
|
+
return undefined;
|
|
201
|
+
const refPattern = kind === "workspace" ? /(workspace:[^\s]+)/ : /(surface:[^\s]+)/;
|
|
202
|
+
const refMatch = trimmed.match(refPattern);
|
|
203
|
+
if (refMatch)
|
|
204
|
+
return refMatch[1];
|
|
205
|
+
const withoutOK = trimmed.replace(/^OK\s+/, "");
|
|
206
|
+
const firstToken = withoutOK.split(/\s+/)[0];
|
|
207
|
+
return firstToken || undefined;
|
|
208
|
+
}
|
|
130
209
|
function withTimeout(promise, ms) {
|
|
131
210
|
return new Promise((resolve, reject) => {
|
|
132
211
|
const timer = setTimeout(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cmux.js","sourceRoot":"","sources":["../../src/adapters/cmux.ts"],"names":[],"mappings":"AA+BA,MAAM,OAAO,WAAW;IAKZ;IACA;IALF,MAAM,GAAe,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;IAC1D,SAAS,GAAyB,IAAI,CAAC;IAEjD,YACU,OAA6B,EAC7B,OAA2B;QAD3B,YAAO,GAAP,OAAO,CAAsB;QAC7B,YAAO,GAAP,OAAO,CAAoB;IAClC,CAAC;IAEJ,KAAK,CAAC,OAAO;QACX,qCAAqC;QACrC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,IAAI,CAAC;gBACH,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;YACzB,CAAC;YAAC,MAAM,CAAC;gBACP,sBAAsB;YACxB,CAAC;YACD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;QACxB,CAAC;QAED,mEAAmE;QACnE,gEAAgE;QAChE,gEAAgE;QAChE,2DAA2D;QAC3D,MAAM,MAAM,GAAwC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;QAExE,IAAI,CAAC;YACH,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,GAAG,MAAM,WAAW,CACnD,CAAC,KAAK,IAAI,EAAE;gBACV,MAAM,CAAC,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;gBAExC,MAAM,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"cmux.js","sourceRoot":"","sources":["../../src/adapters/cmux.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,73 @@
|
|
|
1
|
+
import type { ExecFn } from "./tmux.js";
|
|
2
|
+
export type ComposeResult = {
|
|
3
|
+
ok: true;
|
|
4
|
+
} | {
|
|
5
|
+
ok: false;
|
|
6
|
+
code: string;
|
|
7
|
+
message: string;
|
|
8
|
+
};
|
|
9
|
+
export interface ComposeServiceStatus {
|
|
10
|
+
name: string;
|
|
11
|
+
state: string;
|
|
12
|
+
status: string;
|
|
13
|
+
health: string | null;
|
|
14
|
+
}
|
|
15
|
+
export interface ComposeStatusResult {
|
|
16
|
+
ok: boolean;
|
|
17
|
+
services: ComposeServiceStatus[];
|
|
18
|
+
error?: string;
|
|
19
|
+
}
|
|
20
|
+
export interface ComposeLogsResult {
|
|
21
|
+
ok: boolean;
|
|
22
|
+
output: string;
|
|
23
|
+
error?: string;
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* I/O adapter for Docker Compose. Shells out to `docker compose`.
|
|
27
|
+
* Lives in adapters/ alongside tmux.ts — infrastructure I/O, not domain logic.
|
|
28
|
+
*/
|
|
29
|
+
export declare class ComposeServicesAdapter {
|
|
30
|
+
private exec;
|
|
31
|
+
constructor(exec: ExecFn);
|
|
32
|
+
/** Start services with docker compose up -d. Readiness is handled by services-readiness, not --wait. */
|
|
33
|
+
up(opts: {
|
|
34
|
+
composeFile: string;
|
|
35
|
+
projectName: string;
|
|
36
|
+
profiles?: string[];
|
|
37
|
+
}): Promise<ComposeResult>;
|
|
38
|
+
/** Stop services according to down policy. */
|
|
39
|
+
down(opts: {
|
|
40
|
+
composeFile: string;
|
|
41
|
+
projectName: string;
|
|
42
|
+
profiles?: string[];
|
|
43
|
+
policy: "leave_running" | "down" | "down_and_volumes";
|
|
44
|
+
}): Promise<ComposeResult>;
|
|
45
|
+
/** Get service statuses via docker compose ps --format json. */
|
|
46
|
+
status(opts: {
|
|
47
|
+
composeFile: string;
|
|
48
|
+
projectName: string;
|
|
49
|
+
profiles?: string[];
|
|
50
|
+
}): Promise<ComposeStatusResult>;
|
|
51
|
+
/** Get logs for a specific service or all services. */
|
|
52
|
+
logs(opts: {
|
|
53
|
+
composeFile: string;
|
|
54
|
+
projectName: string;
|
|
55
|
+
profiles?: string[];
|
|
56
|
+
service?: string;
|
|
57
|
+
tail?: number;
|
|
58
|
+
}): Promise<ComposeLogsResult>;
|
|
59
|
+
/** Run a checkpoint export command. */
|
|
60
|
+
runCheckpointExport(command: string): Promise<ComposeResult>;
|
|
61
|
+
/** Run a checkpoint import command. */
|
|
62
|
+
runCheckpointImport(command: string): Promise<ComposeResult>;
|
|
63
|
+
/** Probe an HTTP wait target. Returns true if the URL responds with 2xx. */
|
|
64
|
+
probeHttp(url: string, timeoutMs?: number): Promise<boolean>;
|
|
65
|
+
/** Probe a TCP wait target. Returns true if the port is open. */
|
|
66
|
+
probeTcp(target: string, timeoutMs?: number): Promise<boolean>;
|
|
67
|
+
private baseArgs;
|
|
68
|
+
private extractComposePsPayload;
|
|
69
|
+
/** Parse docker compose ps --format json. Handles both one-object-per-line and JSON array formats. */
|
|
70
|
+
private parseComposePs;
|
|
71
|
+
private mapServiceStatus;
|
|
72
|
+
}
|
|
73
|
+
//# sourceMappingURL=compose-services-adapter.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compose-services-adapter.d.ts","sourceRoot":"","sources":["../../src/adapters/compose-services-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAIxC,MAAM,MAAM,aAAa,GACrB;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,GACZ;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjD,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,OAAO,CAAC;IACZ,QAAQ,EAAE,oBAAoB,EAAE,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AA2BD;;;GAGG;AACH,qBAAa,sBAAsB;IACjC,OAAO,CAAC,IAAI,CAAS;gBAET,IAAI,EAAE,MAAM;IAIxB,wGAAwG;IAClG,EAAE,CAAC,IAAI,EAAE;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;KACrB,GAAG,OAAO,CAAC,aAAa,CAAC;IAW1B,8CAA8C;IACxC,IAAI,CAAC,IAAI,EAAE;QACf,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QACpB,MAAM,EAAE,eAAe,GAAG,MAAM,GAAG,kBAAkB,CAAC;KACvD,GAAG,OAAO,CAAC,aAAa,CAAC;IAgB1B,gEAAgE;IAC1D,MAAM,CAAC,IAAI,EAAE;QACjB,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;KACrB,GAAG,OAAO,CAAC,mBAAmB,CAAC;IAgBhC,uDAAuD;IACjD,IAAI,CAAC,IAAI,EAAE;QACf,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QACpB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAa9B,uCAAuC;IACjC,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IASlE,uCAAuC;IACjC,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IASlE,4EAA4E;IACtE,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,GAAE,MAAa,GAAG,OAAO,CAAC,OAAO,CAAC;IAWxE,iEAAiE;IAC3D,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,GAAE,MAAa,GAAG,OAAO,CAAC,OAAO,CAAC;IAc1E,OAAO,CAAC,QAAQ;IAUhB,OAAO,CAAC,uBAAuB;IAa/B,sGAAsG;IACtG,OAAO,CAAC,cAAc;IAyBtB,OAAO,CAAC,gBAAgB;CAQzB"}
|
|
@@ -0,0 +1,195 @@
|
|
|
1
|
+
/** Shell-quote a string using single quotes (POSIX-safe). */
|
|
2
|
+
function sq(s) {
|
|
3
|
+
return "'" + s.replace(/'/g, "'\"'\"'") + "'";
|
|
4
|
+
}
|
|
5
|
+
function formatExecError(err) {
|
|
6
|
+
if (err instanceof Error) {
|
|
7
|
+
const execErr = err;
|
|
8
|
+
const stdout = typeof execErr.stdout === "string"
|
|
9
|
+
? execErr.stdout.trim()
|
|
10
|
+
: "";
|
|
11
|
+
const stderr = typeof execErr.stderr === "string"
|
|
12
|
+
? execErr.stderr.trim()
|
|
13
|
+
: "";
|
|
14
|
+
const details = [stdout, stderr].filter(Boolean).join("\n");
|
|
15
|
+
if (details && !err.message.includes(details)) {
|
|
16
|
+
return `${err.message}\n${details}`;
|
|
17
|
+
}
|
|
18
|
+
return err.message;
|
|
19
|
+
}
|
|
20
|
+
return String(err);
|
|
21
|
+
}
|
|
22
|
+
// -- Adapter --
|
|
23
|
+
/**
|
|
24
|
+
* I/O adapter for Docker Compose. Shells out to `docker compose`.
|
|
25
|
+
* Lives in adapters/ alongside tmux.ts — infrastructure I/O, not domain logic.
|
|
26
|
+
*/
|
|
27
|
+
export class ComposeServicesAdapter {
|
|
28
|
+
exec;
|
|
29
|
+
constructor(exec) {
|
|
30
|
+
this.exec = exec;
|
|
31
|
+
}
|
|
32
|
+
/** Start services with docker compose up -d. Readiness is handled by services-readiness, not --wait. */
|
|
33
|
+
async up(opts) {
|
|
34
|
+
const args = this.baseArgs(opts.composeFile, opts.projectName, opts.profiles);
|
|
35
|
+
const cmd = `docker compose ${args} up -d 2>&1`;
|
|
36
|
+
try {
|
|
37
|
+
await this.exec(cmd);
|
|
38
|
+
return { ok: true };
|
|
39
|
+
}
|
|
40
|
+
catch (err) {
|
|
41
|
+
return { ok: false, code: "compose_up_failed", message: formatExecError(err) };
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
/** Stop services according to down policy. */
|
|
45
|
+
async down(opts) {
|
|
46
|
+
if (opts.policy === "leave_running") {
|
|
47
|
+
return { ok: true }; // intentional no-op
|
|
48
|
+
}
|
|
49
|
+
const args = this.baseArgs(opts.composeFile, opts.projectName, opts.profiles);
|
|
50
|
+
const volumeFlag = opts.policy === "down_and_volumes" ? " --volumes" : "";
|
|
51
|
+
const cmd = `docker compose ${args} down${volumeFlag} 2>&1`;
|
|
52
|
+
try {
|
|
53
|
+
await this.exec(cmd);
|
|
54
|
+
return { ok: true };
|
|
55
|
+
}
|
|
56
|
+
catch (err) {
|
|
57
|
+
return { ok: false, code: "compose_down_failed", message: formatExecError(err) };
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
/** Get service statuses via docker compose ps --format json. */
|
|
61
|
+
async status(opts) {
|
|
62
|
+
const args = this.baseArgs(opts.composeFile, opts.projectName, opts.profiles);
|
|
63
|
+
const cmd = `docker compose ${args} ps --format json 2>&1`;
|
|
64
|
+
try {
|
|
65
|
+
const output = await this.exec(cmd);
|
|
66
|
+
const parseInput = this.extractComposePsPayload(output);
|
|
67
|
+
const services = this.parseComposePs(parseInput);
|
|
68
|
+
if (parseInput !== "" && services.length === 0) {
|
|
69
|
+
return { ok: false, services: [], error: "docker compose ps returned unparseable JSON output" };
|
|
70
|
+
}
|
|
71
|
+
return { ok: true, services };
|
|
72
|
+
}
|
|
73
|
+
catch (err) {
|
|
74
|
+
return { ok: false, services: [], error: formatExecError(err) };
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
/** Get logs for a specific service or all services. */
|
|
78
|
+
async logs(opts) {
|
|
79
|
+
const args = this.baseArgs(opts.composeFile, opts.projectName, opts.profiles);
|
|
80
|
+
const serviceArg = opts.service ? ` ${sq(opts.service)}` : "";
|
|
81
|
+
const tailArg = opts.tail ? ` --tail ${opts.tail}` : "";
|
|
82
|
+
const cmd = `docker compose ${args} logs${tailArg}${serviceArg} 2>&1`;
|
|
83
|
+
try {
|
|
84
|
+
const output = await this.exec(cmd);
|
|
85
|
+
return { ok: true, output };
|
|
86
|
+
}
|
|
87
|
+
catch (err) {
|
|
88
|
+
return { ok: false, output: "", error: formatExecError(err) };
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
/** Run a checkpoint export command. */
|
|
92
|
+
async runCheckpointExport(command) {
|
|
93
|
+
try {
|
|
94
|
+
await this.exec(command);
|
|
95
|
+
return { ok: true };
|
|
96
|
+
}
|
|
97
|
+
catch (err) {
|
|
98
|
+
return { ok: false, code: "checkpoint_export_failed", message: formatExecError(err) };
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
/** Run a checkpoint import command. */
|
|
102
|
+
async runCheckpointImport(command) {
|
|
103
|
+
try {
|
|
104
|
+
await this.exec(command);
|
|
105
|
+
return { ok: true };
|
|
106
|
+
}
|
|
107
|
+
catch (err) {
|
|
108
|
+
return { ok: false, code: "checkpoint_import_failed", message: formatExecError(err) };
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
/** Probe an HTTP wait target. Returns true if the URL responds with 2xx. */
|
|
112
|
+
async probeHttp(url, timeoutMs = 5000) {
|
|
113
|
+
try {
|
|
114
|
+
const cmd = `curl -sf -o /dev/null -w '%{http_code}' --max-time ${Math.ceil(timeoutMs / 1000)} ${sq(url)} 2>/dev/null`;
|
|
115
|
+
const output = await this.exec(cmd);
|
|
116
|
+
const code = parseInt(output.trim(), 10);
|
|
117
|
+
return code >= 200 && code < 400;
|
|
118
|
+
}
|
|
119
|
+
catch {
|
|
120
|
+
return false;
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
/** Probe a TCP wait target. Returns true if the port is open. */
|
|
124
|
+
async probeTcp(target, timeoutMs = 5000) {
|
|
125
|
+
try {
|
|
126
|
+
const [host, portStr] = target.split(":");
|
|
127
|
+
if (!host || !portStr)
|
|
128
|
+
return false;
|
|
129
|
+
const cmd = `nc -z -w ${Math.ceil(timeoutMs / 1000)} ${sq(host)} ${sq(portStr)} 2>/dev/null`;
|
|
130
|
+
await this.exec(cmd);
|
|
131
|
+
return true;
|
|
132
|
+
}
|
|
133
|
+
catch {
|
|
134
|
+
return false;
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
// -- Private helpers --
|
|
138
|
+
baseArgs(composeFile, projectName, profiles) {
|
|
139
|
+
const parts = [`-f ${sq(composeFile)}`, `-p ${sq(projectName)}`];
|
|
140
|
+
if (profiles && profiles.length > 0) {
|
|
141
|
+
for (const p of profiles) {
|
|
142
|
+
parts.push(`--profile ${sq(p)}`);
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
return parts.join(" ");
|
|
146
|
+
}
|
|
147
|
+
extractComposePsPayload(output) {
|
|
148
|
+
const trimmed = output.trim();
|
|
149
|
+
if (!trimmed)
|
|
150
|
+
return "";
|
|
151
|
+
if (trimmed.startsWith("{") || trimmed.startsWith("["))
|
|
152
|
+
return trimmed;
|
|
153
|
+
const jsonLines = trimmed
|
|
154
|
+
.split("\n")
|
|
155
|
+
.map((line) => line.trim())
|
|
156
|
+
.filter((line) => line.startsWith("{") || line.startsWith("["));
|
|
157
|
+
return jsonLines.join("\n");
|
|
158
|
+
}
|
|
159
|
+
/** Parse docker compose ps --format json. Handles both one-object-per-line and JSON array formats. */
|
|
160
|
+
parseComposePs(output) {
|
|
161
|
+
const trimmed = output.trim();
|
|
162
|
+
if (!trimmed)
|
|
163
|
+
return [];
|
|
164
|
+
// Try JSON array first
|
|
165
|
+
if (trimmed.startsWith("[")) {
|
|
166
|
+
try {
|
|
167
|
+
const arr = JSON.parse(trimmed);
|
|
168
|
+
return arr.map((obj) => this.mapServiceStatus(obj));
|
|
169
|
+
}
|
|
170
|
+
catch { /* fall through to line-by-line */ }
|
|
171
|
+
}
|
|
172
|
+
// One JSON object per line
|
|
173
|
+
const results = [];
|
|
174
|
+
for (const line of trimmed.split("\n")) {
|
|
175
|
+
const l = line.trim();
|
|
176
|
+
if (!l || !l.startsWith("{"))
|
|
177
|
+
continue;
|
|
178
|
+
try {
|
|
179
|
+
const obj = JSON.parse(l);
|
|
180
|
+
results.push(this.mapServiceStatus(obj));
|
|
181
|
+
}
|
|
182
|
+
catch { /* skip malformed lines */ }
|
|
183
|
+
}
|
|
184
|
+
return results;
|
|
185
|
+
}
|
|
186
|
+
mapServiceStatus(obj) {
|
|
187
|
+
return {
|
|
188
|
+
name: String(obj["Service"] ?? obj["Name"] ?? ""),
|
|
189
|
+
state: String(obj["State"] ?? ""),
|
|
190
|
+
status: String(obj["Status"] ?? ""),
|
|
191
|
+
health: typeof obj["Health"] === "string" ? obj["Health"] : null,
|
|
192
|
+
};
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
//# sourceMappingURL=compose-services-adapter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compose-services-adapter.js","sourceRoot":"","sources":["../../src/adapters/compose-services-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tmux-exec.d.ts","sourceRoot":"","sources":["../../src/adapters/tmux-exec.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"tmux-exec.d.ts","sourceRoot":"","sources":["../../src/adapters/tmux-exec.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAexC;;;GAGG;AACH,eAAO,MAAM,WAAW,EAAE,MAWzB,CAAC"}
|
|
@@ -1,12 +1,32 @@
|
|
|
1
1
|
import { exec } from "node:child_process";
|
|
2
2
|
import { promisify } from "node:util";
|
|
3
3
|
const execAsync = promisify(exec);
|
|
4
|
+
function extractExecOutput(err) {
|
|
5
|
+
if (!err || typeof err !== "object")
|
|
6
|
+
return "";
|
|
7
|
+
const stdout = typeof err.stdout === "string"
|
|
8
|
+
? err.stdout.trim()
|
|
9
|
+
: "";
|
|
10
|
+
const stderr = typeof err.stderr === "string"
|
|
11
|
+
? err.stderr.trim()
|
|
12
|
+
: "";
|
|
13
|
+
return [stdout, stderr].filter(Boolean).join("\n");
|
|
14
|
+
}
|
|
4
15
|
/**
|
|
5
16
|
* Production ExecFn for TmuxAdapter.
|
|
6
17
|
* Wraps child_process.exec (shell command string) and returns stdout.
|
|
7
18
|
*/
|
|
8
19
|
export const execCommand = async (cmd) => {
|
|
9
|
-
|
|
10
|
-
|
|
20
|
+
try {
|
|
21
|
+
const { stdout } = await execAsync(cmd);
|
|
22
|
+
return stdout;
|
|
23
|
+
}
|
|
24
|
+
catch (err) {
|
|
25
|
+
const output = extractExecOutput(err);
|
|
26
|
+
if (err instanceof Error && output && !err.message.includes(output)) {
|
|
27
|
+
throw new Error(`${err.message}\n${output}`);
|
|
28
|
+
}
|
|
29
|
+
throw err;
|
|
30
|
+
}
|
|
11
31
|
};
|
|
12
32
|
//# sourceMappingURL=tmux-exec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tmux-exec.js","sourceRoot":"","sources":["../../src/adapters/tmux-exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAGtC,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AAElC;;;GAGG;AACH,MAAM,CAAC,MAAM,WAAW,GAAW,KAAK,EAAE,GAAW,EAAmB,EAAE;IACxE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"tmux-exec.js","sourceRoot":"","sources":["../../src/adapters/tmux-exec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAGtC,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;AAElC,SAAS,iBAAiB,CAAC,GAAY;IACrC,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ;QAAE,OAAO,EAAE,CAAC;IAC/C,MAAM,MAAM,GAAG,OAAQ,GAA4B,CAAC,MAAM,KAAK,QAAQ;QACrE,CAAC,CAAE,GAA0B,CAAC,MAAM,CAAC,IAAI,EAAE;QAC3C,CAAC,CAAC,EAAE,CAAC;IACP,MAAM,MAAM,GAAG,OAAQ,GAA4B,CAAC,MAAM,KAAK,QAAQ;QACrE,CAAC,CAAE,GAA0B,CAAC,MAAM,CAAC,IAAI,EAAE;QAC3C,CAAC,CAAC,EAAE,CAAC;IACP,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACrD,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,WAAW,GAAW,KAAK,EAAE,GAAW,EAAmB,EAAE;IACxE,IAAI,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,GAAG,CAAC,CAAC;QACxC,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,MAAM,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,GAAG,YAAY,KAAK,IAAI,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACpE,MAAM,IAAI,KAAK,CAAC,GAAG,GAAG,CAAC,OAAO,KAAK,MAAM,EAAE,CAAC,CAAC;QAC/C,CAAC;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"020_rig_services.d.ts","sourceRoot":"","sources":["../../../src/db/migrations/020_rig_services.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE/C,eAAO,MAAM,iBAAiB,EAAE,SAe/B,CAAC"}
|