@sixb/cli 0.1.2 → 0.1.4
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/README.md +5 -2
- package/dist/commands/api.d.ts.map +1 -1
- package/dist/commands/dev.d.ts +2 -0
- package/dist/commands/dev.d.ts.map +1 -1
- package/dist/commands/worker-group.d.ts +2 -0
- package/dist/commands/worker-group.d.ts.map +1 -1
- package/dist/commands/worker.d.ts +2 -0
- package/dist/commands/worker.d.ts.map +1 -1
- package/dist/lib/agent-turn-timeout.d.ts +6 -0
- package/dist/lib/agent-turn-timeout.d.ts.map +1 -0
- package/dist/lib/runtime.d.ts +3 -0
- package/dist/lib/runtime.d.ts.map +1 -1
- package/dist/lib/worker-concurrency.d.ts +9 -0
- package/dist/lib/worker-concurrency.d.ts.map +1 -0
- package/dist/lib/worker-registry.d.ts +40 -3
- package/dist/lib/worker-registry.d.ts.map +1 -1
- package/dist/ui/index.d.ts +12 -4
- package/dist/ui/index.d.ts.map +1 -1
- package/package.json +14 -14
- package/src/commands/api.tsx +5 -0
- package/src/commands/dev.tsx +30 -7
- package/src/commands/worker-group.tsx +14 -3
- package/src/commands/worker.tsx +18 -3
- package/src/index.tsx +19 -3
- package/src/lib/agent-turn-timeout.ts +40 -0
- package/src/lib/runtime.ts +15 -4
- package/src/lib/worker-concurrency.ts +127 -0
- package/src/lib/worker-registry.ts +60 -14
- package/src/ui/index.tsx +39 -6
package/README.md
CHANGED
|
@@ -55,6 +55,7 @@ CLI is installed, use `sixb create <name>`.
|
|
|
55
55
|
| `--api-port <port>` | `dev`, `api` | `port + 2` | API/auth/docs/WebSocket port |
|
|
56
56
|
| `--api-host <host>` | `dev`, `api` | `--host` | API bind host |
|
|
57
57
|
| `--api-public-origin <origin>` | browser/API commands | dev: `http://localhost:<api-port>` | Public API origin |
|
|
58
|
+
| `--agent-turn-timeout <duration>` | `dev`, agent worker/group | `SIXB_AGENT_TURN_TIMEOUT` or `10m` | Agent turn wall-clock budget, e.g. `30s`, `10m`, or `1h` |
|
|
58
59
|
| `--atlas-public-origin <origin>` | `dev`, `api`, `atlas` | dev: `http://localhost:<port>` | Public Atlas UI origin |
|
|
59
60
|
| `--app-public-origin <origin>` | `dev`, `api`, `app` | dev: `http://localhost:<port+1>` | Public custom app origin |
|
|
60
61
|
| `--api-url <url>` | auth/token commands | `SIXB_API_URL` or `http://localhost:3002` | API origin or `/api` URL |
|
|
@@ -249,7 +250,8 @@ sixb worker-group sync pipeline projection
|
|
|
249
250
|
|
|
250
251
|
`sixb worker-group` with no positional types starts every registered queue worker type in one
|
|
251
252
|
process, including the agent worker when agents and agent storage are configured. Agent workers
|
|
252
|
-
require the API origin through `--api-public-origin` or `SIXB_API_PUBLIC_ORIGIN`.
|
|
253
|
+
require the API origin through `--api-public-origin` or `SIXB_API_PUBLIC_ORIGIN`. Set the per-turn
|
|
254
|
+
wall-clock budget with `--agent-turn-timeout` or `SIXB_AGENT_TURN_TIMEOUT`; it defaults to 10 minutes.
|
|
253
255
|
|
|
254
256
|
`sixb dev` uses separated local ports by default:
|
|
255
257
|
|
|
@@ -271,5 +273,6 @@ They fail with a clear error instead of compiling assets at startup.
|
|
|
271
273
|
worker process owns exactly one queue type. `sixb worker-group [types...]` co-hosts several queue
|
|
272
274
|
workers in a single process for constrained deployments; with no positional types it starts every
|
|
273
275
|
registered worker type. Agent workers require `--api-public-origin` or
|
|
274
|
-
`SIXB_API_PUBLIC_ORIGIN`.
|
|
276
|
+
`SIXB_API_PUBLIC_ORIGIN`. Their turn budget can be set with `--agent-turn-timeout` or
|
|
277
|
+
`SIXB_AGENT_TURN_TIMEOUT`. Both commands reject the built-in `InMemoryQueues` — use `sixb dev`,
|
|
275
278
|
which co-hosts workers in-process.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/commands/api.tsx"],"names":[],"mappings":"AAUA,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB;AAED,wBAAsB,MAAM,CAAC,OAAO,GAAE,UAAe,
|
|
1
|
+
{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/commands/api.tsx"],"names":[],"mappings":"AAUA,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB;AAED,wBAAsB,MAAM,CAAC,OAAO,GAAE,UAAe,iBA6FpD"}
|
package/dist/commands/dev.d.ts
CHANGED
|
@@ -7,6 +7,8 @@ export interface DevOptions {
|
|
|
7
7
|
apiPublicOrigin?: string;
|
|
8
8
|
atlasPublicOrigin?: string;
|
|
9
9
|
appPublicOrigin?: string;
|
|
10
|
+
agentTurnTimeout?: string;
|
|
11
|
+
concurrency?: readonly string[];
|
|
10
12
|
}
|
|
11
13
|
export declare function runDev(options?: DevOptions): Promise<void>;
|
|
12
14
|
//# sourceMappingURL=dev.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/commands/dev.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/commands/dev.tsx"],"names":[],"mappings":"AAYA,MAAM,WAAW,UAAU;IACzB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAChC;AAED,wBAAsB,MAAM,CAAC,OAAO,GAAE,UAAe,iBAyIpD"}
|
|
@@ -3,6 +3,8 @@ export interface WorkerGroupOptions {
|
|
|
3
3
|
noMigrate?: boolean;
|
|
4
4
|
workerTypes?: readonly string[];
|
|
5
5
|
apiPublicOrigin?: string;
|
|
6
|
+
agentTurnTimeout?: string;
|
|
7
|
+
concurrency?: readonly string[];
|
|
6
8
|
}
|
|
7
9
|
export declare function runWorkerGroup(options?: WorkerGroupOptions): Promise<void>;
|
|
8
10
|
//# sourceMappingURL=worker-group.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-group.d.ts","sourceRoot":"","sources":["../../src/commands/worker-group.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"worker-group.d.ts","sourceRoot":"","sources":["../../src/commands/worker-group.tsx"],"names":[],"mappings":"AAqBA,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAChC;AAED,wBAAsB,cAAc,CAAC,OAAO,GAAE,kBAAuB,iBAqGpE"}
|
|
@@ -3,6 +3,8 @@ export interface WorkerOptions {
|
|
|
3
3
|
noMigrate?: boolean;
|
|
4
4
|
workerType?: string;
|
|
5
5
|
apiPublicOrigin?: string;
|
|
6
|
+
agentTurnTimeout?: string;
|
|
7
|
+
concurrency?: string;
|
|
6
8
|
}
|
|
7
9
|
export declare function runWorker(options?: WorkerOptions): Promise<void>;
|
|
8
10
|
//# sourceMappingURL=worker.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../src/commands/worker.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../src/commands/worker.tsx"],"names":[],"mappings":"AAqBA,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED,wBAAsB,SAAS,CAAC,OAAO,GAAE,aAAkB,iBAgF1D"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Resolve the agent turn timeout from the CLI flag or environment. `undefined` leaves the worker's
|
|
3
|
+
* built-in default in authority.
|
|
4
|
+
*/
|
|
5
|
+
export declare function resolveAgentTurnTimeoutMs(value: string | undefined): number | undefined;
|
|
6
|
+
//# sourceMappingURL=agent-turn-timeout.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"agent-turn-timeout.d.ts","sourceRoot":"","sources":["../../src/lib/agent-turn-timeout.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAsBvF"}
|
package/dist/lib/runtime.d.ts
CHANGED
|
@@ -8,6 +8,7 @@ import { RulesWorker } from "@sixb/rules-worker";
|
|
|
8
8
|
import { SyncWorker } from "@sixb/sync-worker";
|
|
9
9
|
import { WorkflowWorker } from "@sixb/workflow-worker";
|
|
10
10
|
import type { LoadedSixbHost } from "./loadSixb";
|
|
11
|
+
import type { WorkerConcurrency } from "./worker-registry";
|
|
11
12
|
export declare function waitForWorkerFailure(worker: Worker | null | undefined): Promise<never>;
|
|
12
13
|
export declare function stopQuietly(stopFn: (() => Promise<void>) | undefined | null): Promise<void>;
|
|
13
14
|
export interface RunningSixbRuntime {
|
|
@@ -26,6 +27,8 @@ export interface RunningSixbRuntime {
|
|
|
26
27
|
export interface StartSixbRuntimeOptions {
|
|
27
28
|
readonly cohostWorkers?: boolean;
|
|
28
29
|
readonly agentApiBaseUrl?: string;
|
|
30
|
+
readonly agentTurnTimeoutMs?: number;
|
|
31
|
+
readonly workerConcurrency?: WorkerConcurrency;
|
|
29
32
|
}
|
|
30
33
|
export interface RunningRulesRuntime {
|
|
31
34
|
readonly rulesWorker: RulesWorker | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/lib/runtime.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAShD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAA;AAGzD,OAAO,EAGL,kBAAkB,EACnB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../src/lib/runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { type WorkerConcurrency, type WorkerType } from "./worker-registry";
|
|
2
|
+
/** Resolve the scalar concurrency accepted by `sixb worker <type>`. */
|
|
3
|
+
export declare function resolveSingleWorkerConcurrency(workerType: WorkerType, value: string | undefined): WorkerConcurrency;
|
|
4
|
+
/**
|
|
5
|
+
* Resolve repeatable `<type>=<count>` values for co-hosted workers. Per-type CLI values override
|
|
6
|
+
* their environment variables; repeated CLI values use the last occurrence.
|
|
7
|
+
*/
|
|
8
|
+
export declare function resolveWorkerConcurrency(values?: readonly string[]): WorkerConcurrency;
|
|
9
|
+
//# sourceMappingURL=worker-concurrency.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worker-concurrency.d.ts","sourceRoot":"","sources":["../../src/lib/worker-concurrency.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,iBAAiB,EACtB,KAAK,UAAU,EAChB,MAAM,mBAAmB,CAAA;AAE1B,uEAAuE;AACvE,wBAAgB,8BAA8B,CAC5C,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,iBAAiB,CAcnB;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,GAAE,SAAS,MAAM,EAAO,GAAG,iBAAiB,CA2B1F"}
|
|
@@ -1,10 +1,47 @@
|
|
|
1
1
|
import type { Worker } from "@sixb/core/internal/workers";
|
|
2
2
|
import type { LoadedSixbHost } from "./loadSixb";
|
|
3
|
+
export declare const WORKER_TYPES: readonly ["sync", "action", "agent", "pipeline", "projection", "workflow"];
|
|
4
|
+
export type WorkerType = (typeof WORKER_TYPES)[number];
|
|
5
|
+
export declare const WORKER_CONCURRENCY_CONFIG: {
|
|
6
|
+
readonly sync: {
|
|
7
|
+
readonly configurable: true;
|
|
8
|
+
readonly environmentVariable: "SIXB_SYNC_WORKER_CONCURRENCY";
|
|
9
|
+
};
|
|
10
|
+
readonly action: {
|
|
11
|
+
readonly configurable: false;
|
|
12
|
+
readonly environmentVariable: "SIXB_ACTION_WORKER_CONCURRENCY";
|
|
13
|
+
};
|
|
14
|
+
readonly agent: {
|
|
15
|
+
readonly configurable: true;
|
|
16
|
+
readonly environmentVariable: "SIXB_AGENT_WORKER_CONCURRENCY";
|
|
17
|
+
};
|
|
18
|
+
readonly pipeline: {
|
|
19
|
+
readonly configurable: true;
|
|
20
|
+
readonly environmentVariable: "SIXB_PIPELINE_WORKER_CONCURRENCY";
|
|
21
|
+
};
|
|
22
|
+
readonly projection: {
|
|
23
|
+
readonly configurable: true;
|
|
24
|
+
readonly environmentVariable: "SIXB_PROJECTION_WORKER_CONCURRENCY";
|
|
25
|
+
};
|
|
26
|
+
readonly workflow: {
|
|
27
|
+
readonly configurable: true;
|
|
28
|
+
readonly environmentVariable: "SIXB_WORKFLOW_WORKER_CONCURRENCY";
|
|
29
|
+
};
|
|
30
|
+
};
|
|
31
|
+
export type ConfigurableWorkerType = {
|
|
32
|
+
[Type in WorkerType]: (typeof WORKER_CONCURRENCY_CONFIG)[Type]["configurable"] extends true ? Type : never;
|
|
33
|
+
}[WorkerType];
|
|
34
|
+
export type WorkerConcurrency = Readonly<Partial<Record<ConfigurableWorkerType, number>>>;
|
|
35
|
+
export type QueueWorkerProcess = Worker & {
|
|
36
|
+
readonly concurrency: number;
|
|
37
|
+
};
|
|
3
38
|
export interface WorkerCreationOptions {
|
|
4
39
|
readonly agentApiBaseUrl?: string;
|
|
40
|
+
readonly agentTurnTimeoutMs?: number;
|
|
41
|
+
readonly workerConcurrency?: WorkerConcurrency;
|
|
5
42
|
}
|
|
6
|
-
export declare function createWorkerForType(sixb: LoadedSixbHost, workerType: string, options?: WorkerCreationOptions):
|
|
7
|
-
export declare function resolveWorkerTypeToStart(requestedWorker?: string):
|
|
43
|
+
export declare function createWorkerForType(sixb: LoadedSixbHost, workerType: string, options?: WorkerCreationOptions): QueueWorkerProcess;
|
|
44
|
+
export declare function resolveWorkerTypeToStart(requestedWorker?: string): WorkerType;
|
|
8
45
|
/**
|
|
9
46
|
* Why this worker cannot be constructed with these options, or `null` when it can. Exported
|
|
10
47
|
* for `sixb worker`, which has to answer this before it migrates storage.
|
|
@@ -26,5 +63,5 @@ export interface WorkerGroupInputs {
|
|
|
26
63
|
* an idle system — so the refusal is right, and it has to say which workers it took down.
|
|
27
64
|
*/
|
|
28
65
|
export declare function assertWorkerInputs(input: WorkerGroupInputs): void;
|
|
29
|
-
export declare function resolveRegisteredWorkerTypes(sixb: LoadedSixbHost): readonly
|
|
66
|
+
export declare function resolveRegisteredWorkerTypes(sixb: LoadedSixbHost): readonly WorkerType[];
|
|
30
67
|
//# sourceMappingURL=worker-registry.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-registry.d.ts","sourceRoot":"","sources":["../../src/lib/worker-registry.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAA;AAMzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAGhD,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"worker-registry.d.ts","sourceRoot":"","sources":["../../src/lib/worker-registry.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAA;AAMzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAGhD,eAAO,MAAM,YAAY,4EAOf,CAAA;AAEV,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,CAAC,CAAA;AAEtD,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;;CAUrC,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;KAClC,IAAI,IAAI,UAAU,GAAG,CAAC,OAAO,yBAAyB,CAAC,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,SAAS,IAAI,GACvF,IAAI,GACJ,KAAK;CACV,CAAC,UAAU,CAAC,CAAA;AAEb,MAAM,MAAM,iBAAiB,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;AACzF,MAAM,MAAM,kBAAkB,GAAG,MAAM,GAAG;IAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAA;AAE1E,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAA;IACjC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAA;IACpC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;CAC/C;AAiDD,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,cAAc,EACpB,UAAU,EAAE,MAAM,EAClB,OAAO,GAAE,qBAA0B,GAClC,kBAAkB,CAOpB;AAED,wBAAgB,wBAAwB,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,UAAU,CAY7E;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,qBAAqB,GAC7B,MAAM,GAAG,IAAI,CAIf;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAA;IACvC,QAAQ,CAAC,OAAO,EAAE,qBAAqB,CAAA;IACvC;;;OAGG;IACH,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAA;CAC/B;AAED;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI,CA6BjE;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,cAAc,GAAG,SAAS,UAAU,EAAE,CA4BxF"}
|
package/dist/ui/index.d.ts
CHANGED
|
@@ -53,24 +53,32 @@ export declare function ErrorView({ title, message, remediation, details, }: {
|
|
|
53
53
|
remediation?: string;
|
|
54
54
|
details?: readonly string[];
|
|
55
55
|
}): import("react/jsx-runtime").JSX.Element;
|
|
56
|
-
export declare function DevView({ name, apiUrl, apiDocsUrl, wsUrl, uiUrl, appUrl, warnings, }: {
|
|
56
|
+
export declare function DevView({ name, apiUrl, apiDocsUrl, wsUrl, uiUrl, appUrl, workers, warnings, }: {
|
|
57
57
|
name: string;
|
|
58
58
|
apiUrl: string;
|
|
59
59
|
apiDocsUrl: string;
|
|
60
60
|
wsUrl: string;
|
|
61
61
|
uiUrl: string | null;
|
|
62
62
|
appUrl?: string | null;
|
|
63
|
+
workers?: readonly {
|
|
64
|
+
readonly type: string;
|
|
65
|
+
readonly concurrency: number;
|
|
66
|
+
}[];
|
|
63
67
|
warnings?: readonly string[];
|
|
64
68
|
}): import("react/jsx-runtime").JSX.Element;
|
|
65
|
-
export declare function WorkerView({ name, workerId, storage, warnings, }: {
|
|
69
|
+
export declare function WorkerView({ name, workerId, concurrency, storage, warnings, }: {
|
|
66
70
|
name: string;
|
|
67
71
|
workerId: string;
|
|
72
|
+
concurrency: number;
|
|
68
73
|
storage?: string | null;
|
|
69
74
|
warnings?: readonly string[];
|
|
70
75
|
}): import("react/jsx-runtime").JSX.Element;
|
|
71
|
-
export declare function WorkerGroupView({ name,
|
|
76
|
+
export declare function WorkerGroupView({ name, workers, storage, warnings, }: {
|
|
72
77
|
name: string;
|
|
73
|
-
|
|
78
|
+
workers: readonly {
|
|
79
|
+
readonly type: string;
|
|
80
|
+
readonly concurrency: number;
|
|
81
|
+
}[];
|
|
74
82
|
storage?: string | null;
|
|
75
83
|
warnings?: readonly string[];
|
|
76
84
|
}): import("react/jsx-runtime").JSX.Element;
|
package/dist/ui/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ui/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAM9B,wBAAsB,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,iBAOvD;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,0BAErD;AAED;;;GAGG;AACH,wBAAsB,cAAc,CAClC,KAAK,EAAE,OAAO,EACd,OAAO,GAAE;IAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAAO,GAC9E,OAAO,CAAC,IAAI,CAAC,CASf;AAmBD,MAAM,MAAM,YAAY,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAA;AAsF3D,wBAAgB,kBAAkB,CAAC,EACjC,KAAK,EACL,QAAQ,EACR,KAAK,EACL,UAAoB,EACpB,OAAO,GACR,EAAE;IACD,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,SAAS,YAAY,EAAE,CAAA;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,2CAiBA;AAED,wBAAgB,eAAe,CAAC,EAC9B,KAAK,EACL,QAAQ,EACR,OAAO,EACP,IAAI,EACJ,YAAY,GACb,EAAE;IACD,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;IAC1B,IAAI,EAAE,SAAS,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,CAAA;IACpC,YAAY,EAAE,MAAM,CAAA;CACrB,2CAeA;AAED,wBAAgB,gBAAgB,CAAC,EAC/B,KAAK,EACL,QAAQ,EACR,KAAK,EACL,WAAqB,EACrB,MAAM,EACN,OAA8D,GAC/D,EAAE;IACD,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,EAAE,SAAS,YAAY,EAAE,CAAA;IAC9B,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,2CAqBA;AA4DD,wBAAgB,WAAW,CAAC,EAC1B,KAAK,EACL,QAAQ,EACR,MAAM,GACP,EAAE;IACD,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;CACf,2CAYA;AAED,wBAAgB,QAAQ,CAAC,EAAE,YAAY,EAAE,EAAE;IAAE,YAAY,CAAC,EAAE,MAAM,CAAA;CAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ui/index.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sixb/cli",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.4",
|
|
4
4
|
"description": "Command-line interface for Sixb projects",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"sixb",
|
|
@@ -29,19 +29,19 @@
|
|
|
29
29
|
"prepack": "bun run build"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@sixb/action-worker": "0.1.
|
|
33
|
-
"@sixb/agent-worker": "0.1.
|
|
34
|
-
"@sixb/app": "^0.1.
|
|
35
|
-
"@sixb/atlas": "^0.1.
|
|
36
|
-
"@sixb/client": "^0.1.
|
|
37
|
-
"@sixb/core": "0.1.
|
|
38
|
-
"@sixb/orchestrator": "0.1.
|
|
39
|
-
"@sixb/pipeline-worker": "0.1.
|
|
40
|
-
"@sixb/projection-worker": "0.1.
|
|
41
|
-
"@sixb/rules-worker": "0.1.
|
|
42
|
-
"@sixb/server": "0.1.
|
|
43
|
-
"@sixb/sync-worker": "0.1.
|
|
44
|
-
"@sixb/workflow-worker": "0.1.
|
|
32
|
+
"@sixb/action-worker": "0.1.4",
|
|
33
|
+
"@sixb/agent-worker": "0.1.4",
|
|
34
|
+
"@sixb/app": "^0.1.4",
|
|
35
|
+
"@sixb/atlas": "^0.1.4",
|
|
36
|
+
"@sixb/client": "^0.1.4",
|
|
37
|
+
"@sixb/core": "0.1.4",
|
|
38
|
+
"@sixb/orchestrator": "0.1.4",
|
|
39
|
+
"@sixb/pipeline-worker": "0.1.4",
|
|
40
|
+
"@sixb/projection-worker": "0.1.4",
|
|
41
|
+
"@sixb/rules-worker": "0.1.4",
|
|
42
|
+
"@sixb/server": "0.1.4",
|
|
43
|
+
"@sixb/sync-worker": "0.1.4",
|
|
44
|
+
"@sixb/workflow-worker": "0.1.4",
|
|
45
45
|
"create-sixb": "^0.1.2",
|
|
46
46
|
"ink": "^6.0.0",
|
|
47
47
|
"react": "^19.0.0",
|
package/src/commands/api.tsx
CHANGED
|
@@ -52,6 +52,10 @@ export async function runApi(options: ApiOptions = {}) {
|
|
|
52
52
|
const hasBuiltCustomApp = await stat(resolve(appOutdir, "index.html"))
|
|
53
53
|
.then(() => true)
|
|
54
54
|
.catch(() => false)
|
|
55
|
+
const authExperienceOutdir = resolve(appOutdir, "auth")
|
|
56
|
+
const hasAuthExperience = await stat(resolve(authExperienceOutdir, "index.html"))
|
|
57
|
+
.then(() => true)
|
|
58
|
+
.catch(() => false)
|
|
55
59
|
const topology = resolveBrowserTopology({
|
|
56
60
|
role: "api",
|
|
57
61
|
host: options.host,
|
|
@@ -73,6 +77,7 @@ export async function runApi(options: ApiOptions = {}) {
|
|
|
73
77
|
publicOrigin: topology.apiPublicOrigin,
|
|
74
78
|
allowedOrigins: topology.allowedBrowserOrigins,
|
|
75
79
|
},
|
|
80
|
+
...(hasAuthExperience ? { authExperience: { outdir: authExperienceOutdir } } : {}),
|
|
76
81
|
})
|
|
77
82
|
await server.start()
|
|
78
83
|
|
package/src/commands/dev.tsx
CHANGED
|
@@ -2,10 +2,12 @@ import { dirname, resolve } from "node:path"
|
|
|
2
2
|
import { type CustomAppDevServer, createCustomApp } from "@sixb/app"
|
|
3
3
|
import { type AtlasAppServer, createAtlasApp } from "@sixb/atlas"
|
|
4
4
|
import { createSixbServer, type SixbServer } from "@sixb/server"
|
|
5
|
+
import { resolveAgentTurnTimeoutMs } from "../lib/agent-turn-timeout"
|
|
5
6
|
import { apiDocsUrl, apiEventsUrl, apiUrl, resolveBrowserTopology } from "../lib/browser-topology"
|
|
6
7
|
import { type LoadedSixbHost, loadSixbFromEntry } from "../lib/loadSixb"
|
|
7
8
|
import { runUntilSignal, startSixbRuntime, stopQuietly } from "../lib/runtime"
|
|
8
9
|
import { generateProjectTypes } from "../lib/typegen"
|
|
10
|
+
import { resolveWorkerConcurrency } from "../lib/worker-concurrency"
|
|
9
11
|
import { DevView, LoadingView, renderCliError, renderPersistent } from "../ui"
|
|
10
12
|
|
|
11
13
|
export interface DevOptions {
|
|
@@ -17,11 +19,15 @@ export interface DevOptions {
|
|
|
17
19
|
apiPublicOrigin?: string
|
|
18
20
|
atlasPublicOrigin?: string
|
|
19
21
|
appPublicOrigin?: string
|
|
22
|
+
agentTurnTimeout?: string
|
|
23
|
+
concurrency?: readonly string[]
|
|
20
24
|
}
|
|
21
25
|
|
|
22
26
|
export async function runDev(options: DevOptions = {}) {
|
|
23
27
|
process.env.NODE_ENV = "development"
|
|
24
28
|
|
|
29
|
+
const agentTurnTimeoutMs = resolveAgentTurnTimeoutMs(options.agentTurnTimeout)
|
|
30
|
+
const workerConcurrency = resolveWorkerConcurrency(options.concurrency)
|
|
25
31
|
const entry = resolve(options.entry ?? "sixb.config.ts")
|
|
26
32
|
|
|
27
33
|
const app = renderPersistent(
|
|
@@ -53,10 +59,23 @@ export async function runDev(options: DevOptions = {}) {
|
|
|
53
59
|
appPublicOrigin: options.appPublicOrigin,
|
|
54
60
|
hasCustomApp,
|
|
55
61
|
})
|
|
62
|
+
const customApp = await createCustomApp({
|
|
63
|
+
rootDir: projectRoot,
|
|
64
|
+
apiBaseUrl: topology.apiPublicOrigin,
|
|
65
|
+
audience: "app",
|
|
66
|
+
authEnabled: host.auth.isEnabled(),
|
|
67
|
+
})
|
|
68
|
+
const authExperience = hasCustomApp
|
|
69
|
+
? ((await customApp.prepareAuthExperience()) ?? {
|
|
70
|
+
outdir: resolve(projectRoot, ".sixb", "generated", "auth"),
|
|
71
|
+
})
|
|
72
|
+
: null
|
|
56
73
|
|
|
57
74
|
runtime = await startSixbRuntime(host, {
|
|
58
75
|
cohostWorkers: true,
|
|
59
76
|
agentApiBaseUrl: topology.apiPublicOrigin,
|
|
77
|
+
agentTurnTimeoutMs,
|
|
78
|
+
workerConcurrency,
|
|
60
79
|
})
|
|
61
80
|
const authEnabled = host.auth.isEnabled()
|
|
62
81
|
|
|
@@ -71,6 +90,7 @@ export async function runDev(options: DevOptions = {}) {
|
|
|
71
90
|
publicOrigin: topology.apiPublicOrigin,
|
|
72
91
|
allowedOrigins: topology.allowedBrowserOrigins,
|
|
73
92
|
},
|
|
93
|
+
...(authExperience ? { authExperience } : {}),
|
|
74
94
|
})
|
|
75
95
|
await server.start()
|
|
76
96
|
|
|
@@ -85,13 +105,6 @@ export async function runDev(options: DevOptions = {}) {
|
|
|
85
105
|
development: true,
|
|
86
106
|
})
|
|
87
107
|
|
|
88
|
-
const customApp = await createCustomApp({
|
|
89
|
-
rootDir: projectRoot,
|
|
90
|
-
apiBaseUrl: topology.apiPublicOrigin,
|
|
91
|
-
audience: "app",
|
|
92
|
-
authEnabled,
|
|
93
|
-
})
|
|
94
|
-
|
|
95
108
|
let appUrl: string | null = null
|
|
96
109
|
if (hasCustomApp) {
|
|
97
110
|
app.rerender(
|
|
@@ -113,6 +126,16 @@ export async function runDev(options: DevOptions = {}) {
|
|
|
113
126
|
wsUrl={apiEventsUrl(topology)}
|
|
114
127
|
uiUrl={topology.atlasPublicOrigin}
|
|
115
128
|
appUrl={appUrl}
|
|
129
|
+
workers={[
|
|
130
|
+
{ type: "action", worker: runtime.actionWorker },
|
|
131
|
+
{ type: "agent", worker: runtime.agentWorker },
|
|
132
|
+
{ type: "projection", worker: runtime.projectionWorker },
|
|
133
|
+
{ type: "pipeline", worker: runtime.pipelineWorker },
|
|
134
|
+
{ type: "workflow", worker: runtime.workflowWorker },
|
|
135
|
+
{ type: "sync", worker: runtime.syncWorker },
|
|
136
|
+
].flatMap(({ type, worker }) =>
|
|
137
|
+
worker ? [{ type, concurrency: worker.concurrency }] : []
|
|
138
|
+
)}
|
|
116
139
|
warnings={runtime.warnings}
|
|
117
140
|
/>
|
|
118
141
|
)
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { resolveAgentTurnTimeoutMs } from "../lib/agent-turn-timeout"
|
|
2
2
|
import { type LoadedSixbHost, loadSixbFromEntry } from "../lib/loadSixb"
|
|
3
3
|
import { resolveRuntimeEntry } from "../lib/production"
|
|
4
4
|
import {
|
|
@@ -9,9 +9,11 @@ import {
|
|
|
9
9
|
} from "../lib/runtime"
|
|
10
10
|
import { assertShareableProviders } from "../lib/shareable-providers"
|
|
11
11
|
import { migrateStorageForRole } from "../lib/storage-migration"
|
|
12
|
+
import { resolveWorkerConcurrency } from "../lib/worker-concurrency"
|
|
12
13
|
import {
|
|
13
14
|
assertWorkerInputs,
|
|
14
15
|
createWorkerForType,
|
|
16
|
+
type QueueWorkerProcess,
|
|
15
17
|
resolveRegisteredWorkerTypes,
|
|
16
18
|
resolveWorkerTypeToStart,
|
|
17
19
|
} from "../lib/worker-registry"
|
|
@@ -22,6 +24,8 @@ export interface WorkerGroupOptions {
|
|
|
22
24
|
noMigrate?: boolean
|
|
23
25
|
workerTypes?: readonly string[]
|
|
24
26
|
apiPublicOrigin?: string
|
|
27
|
+
agentTurnTimeout?: string
|
|
28
|
+
concurrency?: readonly string[]
|
|
25
29
|
}
|
|
26
30
|
|
|
27
31
|
export async function runWorkerGroup(options: WorkerGroupOptions = {}) {
|
|
@@ -30,6 +34,8 @@ export async function runWorkerGroup(options: WorkerGroupOptions = {}) {
|
|
|
30
34
|
// Validate explicit worker types before loading the runtime so an unknown type
|
|
31
35
|
// fails fast, just like `sixb worker`.
|
|
32
36
|
const requestedTypes = (options.workerTypes ?? []).map(resolveWorkerTypeToStart)
|
|
37
|
+
const agentTurnTimeoutMs = resolveAgentTurnTimeoutMs(options.agentTurnTimeout)
|
|
38
|
+
const workerConcurrency = resolveWorkerConcurrency(options.concurrency)
|
|
33
39
|
const entry = await resolveRuntimeEntry({ entry: options.entry })
|
|
34
40
|
|
|
35
41
|
const app = renderPersistent(
|
|
@@ -37,7 +43,7 @@ export async function runWorkerGroup(options: WorkerGroupOptions = {}) {
|
|
|
37
43
|
)
|
|
38
44
|
|
|
39
45
|
let sixb: LoadedSixbHost | null = null
|
|
40
|
-
let workers:
|
|
46
|
+
let workers: QueueWorkerProcess[] = []
|
|
41
47
|
|
|
42
48
|
async function stopWorkersAndProviders() {
|
|
43
49
|
await Promise.all(workers.map((worker) => stopQuietly(() => worker.stop())))
|
|
@@ -85,6 +91,8 @@ export async function runWorkerGroup(options: WorkerGroupOptions = {}) {
|
|
|
85
91
|
workers = workerTypes.map((workerType) =>
|
|
86
92
|
createWorkerForType(host, workerType, {
|
|
87
93
|
agentApiBaseUrl: options.apiPublicOrigin,
|
|
94
|
+
agentTurnTimeoutMs,
|
|
95
|
+
workerConcurrency,
|
|
88
96
|
})
|
|
89
97
|
)
|
|
90
98
|
await Promise.all(workers.map((worker) => worker.start()))
|
|
@@ -97,7 +105,10 @@ export async function runWorkerGroup(options: WorkerGroupOptions = {}) {
|
|
|
97
105
|
app.rerender(
|
|
98
106
|
<WorkerGroupView
|
|
99
107
|
name={sixb.id}
|
|
100
|
-
|
|
108
|
+
workers={workerTypes.map((workerType, index) => ({
|
|
109
|
+
type: workerType,
|
|
110
|
+
concurrency: workers[index]?.concurrency ?? 1,
|
|
111
|
+
}))}
|
|
101
112
|
storage={migration.summary}
|
|
102
113
|
warnings={warnings}
|
|
103
114
|
/>
|
package/src/commands/worker.tsx
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { resolveAgentTurnTimeoutMs } from "../lib/agent-turn-timeout"
|
|
2
2
|
import { SixbCliError } from "../lib/errors"
|
|
3
3
|
import { type LoadedSixbHost, loadSixbFromEntry } from "../lib/loadSixb"
|
|
4
4
|
import { resolveRuntimeEntry } from "../lib/production"
|
|
@@ -10,8 +10,10 @@ import {
|
|
|
10
10
|
} from "../lib/runtime"
|
|
11
11
|
import { assertShareableProviders } from "../lib/shareable-providers"
|
|
12
12
|
import { migrateStorageForRole } from "../lib/storage-migration"
|
|
13
|
+
import { resolveSingleWorkerConcurrency } from "../lib/worker-concurrency"
|
|
13
14
|
import {
|
|
14
15
|
createWorkerForType,
|
|
16
|
+
type QueueWorkerProcess,
|
|
15
17
|
resolveWorkerTypeToStart,
|
|
16
18
|
unmetWorkerRequirement,
|
|
17
19
|
} from "../lib/worker-registry"
|
|
@@ -22,12 +24,16 @@ export interface WorkerOptions {
|
|
|
22
24
|
noMigrate?: boolean
|
|
23
25
|
workerType?: string
|
|
24
26
|
apiPublicOrigin?: string
|
|
27
|
+
agentTurnTimeout?: string
|
|
28
|
+
concurrency?: string
|
|
25
29
|
}
|
|
26
30
|
|
|
27
31
|
export async function runWorker(options: WorkerOptions = {}) {
|
|
28
32
|
process.env.NODE_ENV = "production"
|
|
29
33
|
|
|
30
34
|
const workerType = resolveWorkerTypeToStart(options.workerType)
|
|
35
|
+
const agentTurnTimeoutMs = resolveAgentTurnTimeoutMs(options.agentTurnTimeout)
|
|
36
|
+
const workerConcurrency = resolveSingleWorkerConcurrency(workerType, options.concurrency)
|
|
31
37
|
const entry = await resolveRuntimeEntry({ entry: options.entry })
|
|
32
38
|
|
|
33
39
|
const app = renderPersistent(
|
|
@@ -35,7 +41,7 @@ export async function runWorker(options: WorkerOptions = {}) {
|
|
|
35
41
|
)
|
|
36
42
|
|
|
37
43
|
let sixb: LoadedSixbHost | null = null
|
|
38
|
-
let worker:
|
|
44
|
+
let worker: QueueWorkerProcess | null = null
|
|
39
45
|
|
|
40
46
|
try {
|
|
41
47
|
sixb = await loadSixbFromEntry(entry)
|
|
@@ -66,11 +72,20 @@ export async function runWorker(options: WorkerOptions = {}) {
|
|
|
66
72
|
|
|
67
73
|
worker = createWorkerForType(sixb, workerType, {
|
|
68
74
|
agentApiBaseUrl: options.apiPublicOrigin,
|
|
75
|
+
agentTurnTimeoutMs,
|
|
76
|
+
workerConcurrency,
|
|
69
77
|
})
|
|
70
78
|
await worker.start()
|
|
71
79
|
|
|
72
80
|
const workerId = `${workerType}-worker-${sixb.id}`
|
|
73
|
-
app.rerender(
|
|
81
|
+
app.rerender(
|
|
82
|
+
<WorkerView
|
|
83
|
+
name={sixb.id}
|
|
84
|
+
workerId={workerId}
|
|
85
|
+
concurrency={worker.concurrency}
|
|
86
|
+
storage={migration.summary}
|
|
87
|
+
/>
|
|
88
|
+
)
|
|
74
89
|
|
|
75
90
|
await Promise.race([
|
|
76
91
|
runUntilSignal(async () => {
|
package/src/index.tsx
CHANGED
|
@@ -61,7 +61,7 @@ async function readPackageVersion(): Promise<string> {
|
|
|
61
61
|
|
|
62
62
|
function getFlag(name: string): string | undefined {
|
|
63
63
|
const direct = args.find((arg) => arg.startsWith(`--${name}=`))
|
|
64
|
-
if (direct) return direct.
|
|
64
|
+
if (direct) return direct.slice(name.length + 3)
|
|
65
65
|
|
|
66
66
|
const idx = args.indexOf(`--${name}`)
|
|
67
67
|
if (idx >= 0) return args[idx + 1]
|
|
@@ -69,7 +69,7 @@ function getFlag(name: string): string | undefined {
|
|
|
69
69
|
return undefined
|
|
70
70
|
}
|
|
71
71
|
|
|
72
|
-
function getFlags(name: string): string[] {
|
|
72
|
+
function getFlags(name: string, options: { readonly includeMissing?: boolean } = {}): string[] {
|
|
73
73
|
const values: string[] = []
|
|
74
74
|
|
|
75
75
|
for (let index = 0; index < args.length; index++) {
|
|
@@ -79,6 +79,8 @@ function getFlags(name: string): string[] {
|
|
|
79
79
|
if (value && !value.startsWith("--")) {
|
|
80
80
|
values.push(value)
|
|
81
81
|
index++
|
|
82
|
+
} else if (options.includeMissing) {
|
|
83
|
+
values.push("")
|
|
82
84
|
}
|
|
83
85
|
} else if (arg?.startsWith(`--${name}=`)) {
|
|
84
86
|
values.push(arg.slice(name.length + 3))
|
|
@@ -88,6 +90,11 @@ function getFlags(name: string): string[] {
|
|
|
88
90
|
return values
|
|
89
91
|
}
|
|
90
92
|
|
|
93
|
+
function getFlagRequiringValue(name: string): string | undefined {
|
|
94
|
+
const value = getFlag(name)
|
|
95
|
+
return value ?? (hasFlagValue(name) ? "" : undefined)
|
|
96
|
+
}
|
|
97
|
+
|
|
91
98
|
function hasFlag(name: string): boolean {
|
|
92
99
|
return args.includes(`--${name}`)
|
|
93
100
|
}
|
|
@@ -103,6 +110,8 @@ const flagsWithValues = new Set([
|
|
|
103
110
|
"api-port",
|
|
104
111
|
"api-host",
|
|
105
112
|
"api-public-origin",
|
|
113
|
+
"agent-turn-timeout",
|
|
114
|
+
"concurrency",
|
|
106
115
|
"atlas-public-origin",
|
|
107
116
|
"app-public-origin",
|
|
108
117
|
"outdir",
|
|
@@ -128,7 +137,8 @@ function getCommandPositionals(): string[] {
|
|
|
128
137
|
|
|
129
138
|
if (arg.startsWith("--")) {
|
|
130
139
|
const flagName = arg.slice(2).split("=")[0] ?? ""
|
|
131
|
-
|
|
140
|
+
const next = args[index + 1]
|
|
141
|
+
if (!arg.includes("=") && flagsWithValues.has(flagName) && next && !next.startsWith("--")) {
|
|
132
142
|
index++
|
|
133
143
|
}
|
|
134
144
|
continue
|
|
@@ -175,6 +185,8 @@ async function main(): Promise<void> {
|
|
|
175
185
|
apiPublicOrigin: getFlag("api-public-origin"),
|
|
176
186
|
atlasPublicOrigin: getFlag("atlas-public-origin"),
|
|
177
187
|
appPublicOrigin: getFlag("app-public-origin"),
|
|
188
|
+
agentTurnTimeout: getFlag("agent-turn-timeout"),
|
|
189
|
+
concurrency: getFlags("concurrency", { includeMissing: true }),
|
|
178
190
|
})
|
|
179
191
|
break
|
|
180
192
|
}
|
|
@@ -190,6 +202,8 @@ async function main(): Promise<void> {
|
|
|
190
202
|
noMigrate: hasFlag("no-migrate"),
|
|
191
203
|
workerType: getCommandPositionals()[0],
|
|
192
204
|
apiPublicOrigin: getFlag("api-public-origin"),
|
|
205
|
+
agentTurnTimeout: getFlag("agent-turn-timeout"),
|
|
206
|
+
concurrency: getFlagRequiringValue("concurrency"),
|
|
193
207
|
})
|
|
194
208
|
break
|
|
195
209
|
}
|
|
@@ -201,6 +215,8 @@ async function main(): Promise<void> {
|
|
|
201
215
|
noMigrate: hasFlag("no-migrate"),
|
|
202
216
|
workerTypes: getCommandPositionals(),
|
|
203
217
|
apiPublicOrigin: getFlag("api-public-origin"),
|
|
218
|
+
agentTurnTimeout: getFlag("agent-turn-timeout"),
|
|
219
|
+
concurrency: getFlags("concurrency", { includeMissing: true }),
|
|
204
220
|
})
|
|
205
221
|
break
|
|
206
222
|
}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
const MAX_TIMER_DURATION_MS = 2_147_483_647
|
|
2
|
+
|
|
3
|
+
/**
|
|
4
|
+
* Resolve the agent turn timeout from the CLI flag or environment. `undefined` leaves the worker's
|
|
5
|
+
* built-in default in authority.
|
|
6
|
+
*/
|
|
7
|
+
export function resolveAgentTurnTimeoutMs(value: string | undefined): number | undefined {
|
|
8
|
+
const configured = nonblank(value) ?? nonblank(process.env.SIXB_AGENT_TURN_TIMEOUT)
|
|
9
|
+
if (configured === undefined) return undefined
|
|
10
|
+
|
|
11
|
+
const match = configured.match(/^(\d+)(ms|s|m|h)$/)
|
|
12
|
+
if (!match) throw invalidAgentTurnTimeout(configured)
|
|
13
|
+
|
|
14
|
+
const amount = Number(match[1])
|
|
15
|
+
const unit = match[2] as "ms" | "s" | "m" | "h"
|
|
16
|
+
const multipliers = {
|
|
17
|
+
ms: 1,
|
|
18
|
+
s: 1_000,
|
|
19
|
+
m: 60_000,
|
|
20
|
+
h: 60 * 60_000,
|
|
21
|
+
} as const
|
|
22
|
+
const timeoutMs = amount * multipliers[unit]
|
|
23
|
+
|
|
24
|
+
if (!Number.isSafeInteger(timeoutMs) || timeoutMs <= 0 || timeoutMs > MAX_TIMER_DURATION_MS) {
|
|
25
|
+
throw invalidAgentTurnTimeout(configured)
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
return timeoutMs
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
function nonblank(value: string | undefined): string | undefined {
|
|
32
|
+
return value?.trim() || undefined
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
function invalidAgentTurnTimeout(value: string): Error {
|
|
36
|
+
return new Error(
|
|
37
|
+
`[SixbCLI] Invalid agent turn timeout '${value}'. Use a positive duration like 30s, 10m, or 1h ` +
|
|
38
|
+
"with --agent-turn-timeout or SIXB_AGENT_TURN_TIMEOUT."
|
|
39
|
+
)
|
|
40
|
+
}
|
package/src/lib/runtime.ts
CHANGED
|
@@ -23,6 +23,7 @@ import { RulesWorker } from "@sixb/rules-worker"
|
|
|
23
23
|
import { SyncWorker } from "@sixb/sync-worker"
|
|
24
24
|
import { WorkflowWorker } from "@sixb/workflow-worker"
|
|
25
25
|
import type { LoadedSixbHost } from "./loadSixb"
|
|
26
|
+
import type { WorkerConcurrency } from "./worker-registry"
|
|
26
27
|
|
|
27
28
|
export function waitForWorkerFailure(worker: Worker | null | undefined): Promise<never> {
|
|
28
29
|
return new Promise<never>((_resolve, reject) => {
|
|
@@ -56,6 +57,8 @@ export interface RunningSixbRuntime {
|
|
|
56
57
|
export interface StartSixbRuntimeOptions {
|
|
57
58
|
readonly cohostWorkers?: boolean
|
|
58
59
|
readonly agentApiBaseUrl?: string
|
|
60
|
+
readonly agentTurnTimeoutMs?: number
|
|
61
|
+
readonly workerConcurrency?: WorkerConcurrency
|
|
59
62
|
}
|
|
60
63
|
|
|
61
64
|
export interface RunningRulesRuntime {
|
|
@@ -243,28 +246,36 @@ export async function startSixbRuntime(
|
|
|
243
246
|
if (sixb.definitions.agents.list().length > 0 && sixb.storage.agents) {
|
|
244
247
|
agentWorker = new AgentWorker(sixb, {
|
|
245
248
|
apiBaseUrl: requireAgentApiBaseUrl(options.agentApiBaseUrl),
|
|
249
|
+
concurrency: options.workerConcurrency?.agent,
|
|
250
|
+
turnTimeoutMs: options.agentTurnTimeoutMs,
|
|
246
251
|
})
|
|
247
252
|
await agentWorker.start()
|
|
248
253
|
}
|
|
249
254
|
|
|
250
255
|
const projectionCount = sixb.definitions.projections.list().length
|
|
251
256
|
if (projectionCount > 0) {
|
|
252
|
-
projectionWorker = new ProjectionWorker(sixb
|
|
257
|
+
projectionWorker = new ProjectionWorker(sixb, {
|
|
258
|
+
concurrency: options.workerConcurrency?.projection,
|
|
259
|
+
})
|
|
253
260
|
await projectionWorker.start()
|
|
254
261
|
}
|
|
255
262
|
|
|
256
263
|
if (sixb.definitions.pipelines.list().length > 0) {
|
|
257
|
-
pipelineWorker = new PipelineWorker(sixb
|
|
264
|
+
pipelineWorker = new PipelineWorker(sixb, {
|
|
265
|
+
concurrency: options.workerConcurrency?.pipeline,
|
|
266
|
+
})
|
|
258
267
|
await pipelineWorker.start()
|
|
259
268
|
}
|
|
260
269
|
|
|
261
270
|
if (sixb.definitions.workflows.list().length > 0) {
|
|
262
|
-
workflowWorker = new WorkflowWorker(sixb
|
|
271
|
+
workflowWorker = new WorkflowWorker(sixb, {
|
|
272
|
+
concurrency: options.workerConcurrency?.workflow,
|
|
273
|
+
})
|
|
263
274
|
await workflowWorker.start()
|
|
264
275
|
}
|
|
265
276
|
|
|
266
277
|
if (sixb.definitions.syncs.list().length > 0) {
|
|
267
|
-
syncWorker = new SyncWorker(sixb)
|
|
278
|
+
syncWorker = new SyncWorker(sixb, { concurrency: options.workerConcurrency?.sync })
|
|
268
279
|
await syncWorker.start()
|
|
269
280
|
}
|
|
270
281
|
|
|
@@ -0,0 +1,127 @@
|
|
|
1
|
+
import {
|
|
2
|
+
type ConfigurableWorkerType,
|
|
3
|
+
WORKER_CONCURRENCY_CONFIG,
|
|
4
|
+
WORKER_TYPES,
|
|
5
|
+
type WorkerConcurrency,
|
|
6
|
+
type WorkerType,
|
|
7
|
+
} from "./worker-registry"
|
|
8
|
+
|
|
9
|
+
/** Resolve the scalar concurrency accepted by `sixb worker <type>`. */
|
|
10
|
+
export function resolveSingleWorkerConcurrency(
|
|
11
|
+
workerType: WorkerType,
|
|
12
|
+
value: string | undefined
|
|
13
|
+
): WorkerConcurrency {
|
|
14
|
+
const definition = WORKER_CONCURRENCY_CONFIG[workerType]
|
|
15
|
+
if (!isConfigurableWorkerType(workerType)) {
|
|
16
|
+
if (value !== undefined || nonblank(process.env[definition.environmentVariable])) {
|
|
17
|
+
throw fixedActionConcurrency()
|
|
18
|
+
}
|
|
19
|
+
return {}
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
const environmentVariable = definition.environmentVariable
|
|
23
|
+
const configured = value?.trim() ?? nonblank(process.env[environmentVariable])
|
|
24
|
+
if (configured === undefined) return {}
|
|
25
|
+
|
|
26
|
+
return { [workerType]: parseConcurrency(configured, `--concurrency or ${environmentVariable}`) }
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
/**
|
|
30
|
+
* Resolve repeatable `<type>=<count>` values for co-hosted workers. Per-type CLI values override
|
|
31
|
+
* their environment variables; repeated CLI values use the last occurrence.
|
|
32
|
+
*/
|
|
33
|
+
export function resolveWorkerConcurrency(values: readonly string[] = []): WorkerConcurrency {
|
|
34
|
+
const overrides = values.map(parseWorkerConcurrencyEntry)
|
|
35
|
+
const overriddenWorkerTypes = new Set(overrides.map((entry) => entry.workerType))
|
|
36
|
+
const resolved: Partial<Record<ConfigurableWorkerType, number>> = {}
|
|
37
|
+
|
|
38
|
+
for (const workerType of WORKER_TYPES) {
|
|
39
|
+
const definition = WORKER_CONCURRENCY_CONFIG[workerType]
|
|
40
|
+
if (!isConfigurableWorkerType(workerType)) {
|
|
41
|
+
if (nonblank(process.env[definition.environmentVariable])) {
|
|
42
|
+
throw fixedActionConcurrency()
|
|
43
|
+
}
|
|
44
|
+
continue
|
|
45
|
+
}
|
|
46
|
+
if (overriddenWorkerTypes.has(workerType)) continue
|
|
47
|
+
|
|
48
|
+
const environmentVariable = definition.environmentVariable
|
|
49
|
+
const configured = nonblank(process.env[environmentVariable])
|
|
50
|
+
if (configured !== undefined) {
|
|
51
|
+
resolved[workerType] = parseConcurrency(configured, environmentVariable)
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
for (const entry of overrides) {
|
|
56
|
+
resolved[entry.workerType] = entry.concurrency
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
return resolved
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
function parseWorkerConcurrencyEntry(value: string): {
|
|
63
|
+
readonly workerType: ConfigurableWorkerType
|
|
64
|
+
readonly concurrency: number
|
|
65
|
+
} {
|
|
66
|
+
const separator = value.indexOf("=")
|
|
67
|
+
if (separator <= 0 || separator !== value.lastIndexOf("=")) {
|
|
68
|
+
throw invalidWorkerConcurrencyEntry(value)
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
const workerType = value.slice(0, separator).trim()
|
|
72
|
+
const configured = value.slice(separator + 1).trim()
|
|
73
|
+
if (!isWorkerType(workerType)) {
|
|
74
|
+
throw new Error(
|
|
75
|
+
`[SixbCLI] Unknown worker concurrency type '${workerType || value}'. Available: ${WORKER_TYPES.filter(isConfigurableWorkerType).join(", ")}.`
|
|
76
|
+
)
|
|
77
|
+
}
|
|
78
|
+
if (!isConfigurableWorkerType(workerType)) {
|
|
79
|
+
throw fixedActionConcurrency()
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
return {
|
|
83
|
+
workerType,
|
|
84
|
+
concurrency: parseConcurrency(configured, `--concurrency ${workerType}=<count>`),
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
function parseConcurrency(value: string, source: string): number {
|
|
89
|
+
if (!/^[1-9]\d*$/.test(value)) {
|
|
90
|
+
throw invalidConcurrency(value, source)
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
const concurrency = Number(value)
|
|
94
|
+
if (!Number.isSafeInteger(concurrency)) {
|
|
95
|
+
throw invalidConcurrency(value, source)
|
|
96
|
+
}
|
|
97
|
+
return concurrency
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
function nonblank(value: string | undefined): string | undefined {
|
|
101
|
+
return value?.trim() || undefined
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
function isWorkerType(value: string): value is WorkerType {
|
|
105
|
+
return WORKER_TYPES.some((workerType) => workerType === value)
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
function isConfigurableWorkerType(value: WorkerType): value is ConfigurableWorkerType {
|
|
109
|
+
return WORKER_CONCURRENCY_CONFIG[value].configurable
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
function invalidConcurrency(value: string, source: string): Error {
|
|
113
|
+
return new Error(
|
|
114
|
+
`[SixbCLI] Invalid worker concurrency '${value}'. Use a positive integer with ${source}.`
|
|
115
|
+
)
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
function invalidWorkerConcurrencyEntry(value: string): Error {
|
|
119
|
+
return new Error(
|
|
120
|
+
`[SixbCLI] Invalid worker concurrency '${value}'. Use a repeatable type=count value like ` +
|
|
121
|
+
"--concurrency agent=4 --concurrency sync=2."
|
|
122
|
+
)
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
function fixedActionConcurrency(): Error {
|
|
126
|
+
return new Error("[SixbCLI] Action worker concurrency is fixed at 1 and cannot be configured.")
|
|
127
|
+
}
|
|
@@ -9,12 +9,46 @@ import { SixbCliError } from "./errors"
|
|
|
9
9
|
import type { LoadedSixbHost } from "./loadSixb"
|
|
10
10
|
import { configuredOrigin } from "./public-origin"
|
|
11
11
|
|
|
12
|
+
export const WORKER_TYPES = [
|
|
13
|
+
"sync",
|
|
14
|
+
"action",
|
|
15
|
+
"agent",
|
|
16
|
+
"pipeline",
|
|
17
|
+
"projection",
|
|
18
|
+
"workflow",
|
|
19
|
+
] as const
|
|
20
|
+
|
|
21
|
+
export type WorkerType = (typeof WORKER_TYPES)[number]
|
|
22
|
+
|
|
23
|
+
export const WORKER_CONCURRENCY_CONFIG = {
|
|
24
|
+
sync: { configurable: true, environmentVariable: "SIXB_SYNC_WORKER_CONCURRENCY" },
|
|
25
|
+
action: { configurable: false, environmentVariable: "SIXB_ACTION_WORKER_CONCURRENCY" },
|
|
26
|
+
agent: { configurable: true, environmentVariable: "SIXB_AGENT_WORKER_CONCURRENCY" },
|
|
27
|
+
pipeline: { configurable: true, environmentVariable: "SIXB_PIPELINE_WORKER_CONCURRENCY" },
|
|
28
|
+
projection: { configurable: true, environmentVariable: "SIXB_PROJECTION_WORKER_CONCURRENCY" },
|
|
29
|
+
workflow: { configurable: true, environmentVariable: "SIXB_WORKFLOW_WORKER_CONCURRENCY" },
|
|
30
|
+
} as const satisfies Record<
|
|
31
|
+
WorkerType,
|
|
32
|
+
{ readonly configurable: boolean; readonly environmentVariable: string }
|
|
33
|
+
>
|
|
34
|
+
|
|
35
|
+
export type ConfigurableWorkerType = {
|
|
36
|
+
[Type in WorkerType]: (typeof WORKER_CONCURRENCY_CONFIG)[Type]["configurable"] extends true
|
|
37
|
+
? Type
|
|
38
|
+
: never
|
|
39
|
+
}[WorkerType]
|
|
40
|
+
|
|
41
|
+
export type WorkerConcurrency = Readonly<Partial<Record<ConfigurableWorkerType, number>>>
|
|
42
|
+
export type QueueWorkerProcess = Worker & { readonly concurrency: number }
|
|
43
|
+
|
|
12
44
|
export interface WorkerCreationOptions {
|
|
13
45
|
readonly agentApiBaseUrl?: string
|
|
46
|
+
readonly agentTurnTimeoutMs?: number
|
|
47
|
+
readonly workerConcurrency?: WorkerConcurrency
|
|
14
48
|
}
|
|
15
49
|
|
|
16
50
|
interface WorkerFactory {
|
|
17
|
-
readonly create: (sixb: LoadedSixbHost, options: WorkerCreationOptions) =>
|
|
51
|
+
readonly create: (sixb: LoadedSixbHost, options: WorkerCreationOptions) => QueueWorkerProcess
|
|
18
52
|
/**
|
|
19
53
|
* Why this worker cannot be constructed with the given options, or `null` when it can.
|
|
20
54
|
* Asked before anything is constructed, so a group names every reason at once.
|
|
@@ -28,9 +62,10 @@ interface WorkerFactory {
|
|
|
28
62
|
const AGENT_ORIGIN_REQUIRED =
|
|
29
63
|
"requires --api-public-origin or SIXB_API_PUBLIC_ORIGIN (agent workers call the API)"
|
|
30
64
|
|
|
31
|
-
const workerFactories: Record<
|
|
65
|
+
const workerFactories: Record<WorkerType, WorkerFactory> = {
|
|
32
66
|
sync: {
|
|
33
|
-
create: (sixb) =>
|
|
67
|
+
create: (sixb, options) =>
|
|
68
|
+
new SyncWorker(sixb, { concurrency: options.workerConcurrency?.sync }),
|
|
34
69
|
},
|
|
35
70
|
action: {
|
|
36
71
|
create: (sixb) => new ActionWorker(sixb),
|
|
@@ -39,18 +74,23 @@ const workerFactories: Record<string, WorkerFactory> = {
|
|
|
39
74
|
create: (sixb, options) =>
|
|
40
75
|
new AgentWorker(sixb, {
|
|
41
76
|
apiBaseUrl: resolveAgentApiBaseUrl(options.agentApiBaseUrl),
|
|
77
|
+
concurrency: options.workerConcurrency?.agent,
|
|
78
|
+
turnTimeoutMs: options.agentTurnTimeoutMs,
|
|
42
79
|
}),
|
|
43
80
|
unmetRequirement: (options) =>
|
|
44
81
|
agentApiBaseUrl(options.agentApiBaseUrl) ? null : AGENT_ORIGIN_REQUIRED,
|
|
45
82
|
},
|
|
46
83
|
pipeline: {
|
|
47
|
-
create: (sixb) =>
|
|
84
|
+
create: (sixb, options) =>
|
|
85
|
+
new PipelineWorker(sixb, { concurrency: options.workerConcurrency?.pipeline }),
|
|
48
86
|
},
|
|
49
87
|
projection: {
|
|
50
|
-
create: (sixb) =>
|
|
88
|
+
create: (sixb, options) =>
|
|
89
|
+
new ProjectionWorker(sixb, { concurrency: options.workerConcurrency?.projection }),
|
|
51
90
|
},
|
|
52
91
|
workflow: {
|
|
53
|
-
create: (sixb) =>
|
|
92
|
+
create: (sixb, options) =>
|
|
93
|
+
new WorkflowWorker(sixb, { concurrency: options.workerConcurrency?.workflow }),
|
|
54
94
|
},
|
|
55
95
|
}
|
|
56
96
|
|
|
@@ -58,8 +98,8 @@ export function createWorkerForType(
|
|
|
58
98
|
sixb: LoadedSixbHost,
|
|
59
99
|
workerType: string,
|
|
60
100
|
options: WorkerCreationOptions = {}
|
|
61
|
-
):
|
|
62
|
-
const factory = workerFactories[workerType]
|
|
101
|
+
): QueueWorkerProcess {
|
|
102
|
+
const factory = isWorkerType(workerType) ? workerFactories[workerType] : undefined
|
|
63
103
|
if (!factory) {
|
|
64
104
|
throw new Error(`[SixbWorker] Unknown worker '${workerType}'. Available: ${knownWorkers()}`)
|
|
65
105
|
}
|
|
@@ -67,12 +107,12 @@ export function createWorkerForType(
|
|
|
67
107
|
return factory.create(sixb, options)
|
|
68
108
|
}
|
|
69
109
|
|
|
70
|
-
export function resolveWorkerTypeToStart(requestedWorker?: string):
|
|
110
|
+
export function resolveWorkerTypeToStart(requestedWorker?: string): WorkerType {
|
|
71
111
|
if (!requestedWorker) {
|
|
72
112
|
throw new Error(`[SixbWorker] Usage: sixb worker <${knownWorkers().replaceAll(", ", "|")}>`)
|
|
73
113
|
}
|
|
74
114
|
|
|
75
|
-
if (!
|
|
115
|
+
if (!isWorkerType(requestedWorker)) {
|
|
76
116
|
throw new Error(
|
|
77
117
|
`[SixbWorker] Unknown worker '${requestedWorker}'. Available: ${knownWorkers()}`
|
|
78
118
|
)
|
|
@@ -89,7 +129,9 @@ export function unmetWorkerRequirement(
|
|
|
89
129
|
workerType: string,
|
|
90
130
|
options: WorkerCreationOptions
|
|
91
131
|
): string | null {
|
|
92
|
-
return
|
|
132
|
+
return isWorkerType(workerType)
|
|
133
|
+
? (workerFactories[workerType].unmetRequirement?.(options) ?? null)
|
|
134
|
+
: null
|
|
93
135
|
}
|
|
94
136
|
|
|
95
137
|
export interface WorkerGroupInputs {
|
|
@@ -139,8 +181,8 @@ export function assertWorkerInputs(input: WorkerGroupInputs): void {
|
|
|
139
181
|
})
|
|
140
182
|
}
|
|
141
183
|
|
|
142
|
-
export function resolveRegisteredWorkerTypes(sixb: LoadedSixbHost): readonly
|
|
143
|
-
const workerTypes:
|
|
184
|
+
export function resolveRegisteredWorkerTypes(sixb: LoadedSixbHost): readonly WorkerType[] {
|
|
185
|
+
const workerTypes: WorkerType[] = []
|
|
144
186
|
|
|
145
187
|
if (sixb.definitions.syncs.list().length > 0) {
|
|
146
188
|
workerTypes.push("sync")
|
|
@@ -170,7 +212,11 @@ export function resolveRegisteredWorkerTypes(sixb: LoadedSixbHost): readonly str
|
|
|
170
212
|
}
|
|
171
213
|
|
|
172
214
|
function knownWorkers(): string {
|
|
173
|
-
return
|
|
215
|
+
return WORKER_TYPES.join(", ")
|
|
216
|
+
}
|
|
217
|
+
|
|
218
|
+
function isWorkerType(value: string): value is WorkerType {
|
|
219
|
+
return WORKER_TYPES.some((workerType) => workerType === value)
|
|
174
220
|
}
|
|
175
221
|
|
|
176
222
|
function agentApiBaseUrl(value: string | undefined): string | null {
|
package/src/ui/index.tsx
CHANGED
|
@@ -392,6 +392,14 @@ export function HelpView({ errorMessage }: { errorMessage?: string }) {
|
|
|
392
392
|
{ label: "--api-port <port>", value: "API port (default: Atlas port + 2)" },
|
|
393
393
|
{ label: "--api-host <host>", value: "API bind host (default: --host)" },
|
|
394
394
|
{ label: "--api-public-origin <origin>", value: "Public API origin" },
|
|
395
|
+
{
|
|
396
|
+
label: "--agent-turn-timeout <duration>",
|
|
397
|
+
value: "Agent turn wall-clock budget (default: 10m)",
|
|
398
|
+
},
|
|
399
|
+
{
|
|
400
|
+
label: "--concurrency <value>",
|
|
401
|
+
value: "Concurrent jobs: count for worker; repeat type=count for dev/worker-group",
|
|
402
|
+
},
|
|
395
403
|
{ label: "--atlas-public-origin <origin>", value: "Public Atlas origin" },
|
|
396
404
|
{ label: "--app-public-origin <origin>", value: "Public custom app origin" },
|
|
397
405
|
{ label: "--api-url <url>", value: "API origin for auth/token commands" },
|
|
@@ -429,8 +437,8 @@ export function HelpView({ errorMessage }: { errorMessage?: string }) {
|
|
|
429
437
|
"sixb orchestrator",
|
|
430
438
|
"sixb rules",
|
|
431
439
|
"sixb worker pipeline",
|
|
432
|
-
"sixb worker
|
|
433
|
-
"sixb worker-group sync
|
|
440
|
+
"sixb worker agent --concurrency 8",
|
|
441
|
+
"sixb worker-group sync agent --concurrency sync=2 --concurrency agent=8",
|
|
434
442
|
"sixb dev --entry examples/mac-os/sixb.config.ts --port 8080",
|
|
435
443
|
"sixb check",
|
|
436
444
|
"sixb typegen",
|
|
@@ -494,6 +502,7 @@ export function DevView({
|
|
|
494
502
|
wsUrl,
|
|
495
503
|
uiUrl,
|
|
496
504
|
appUrl,
|
|
505
|
+
workers = [],
|
|
497
506
|
warnings = [],
|
|
498
507
|
}: {
|
|
499
508
|
name: string
|
|
@@ -502,6 +511,7 @@ export function DevView({
|
|
|
502
511
|
wsUrl: string
|
|
503
512
|
uiUrl: string | null
|
|
504
513
|
appUrl?: string | null
|
|
514
|
+
workers?: readonly { readonly type: string; readonly concurrency: number }[]
|
|
505
515
|
warnings?: readonly string[]
|
|
506
516
|
}) {
|
|
507
517
|
const serverItems: KeyValueItem[] = [
|
|
@@ -525,6 +535,18 @@ export function DevView({
|
|
|
525
535
|
<ServicePanel name="Custom app" items={[{ label: "URL", value: appUrl }]} />
|
|
526
536
|
</>
|
|
527
537
|
) : null}
|
|
538
|
+
{workers.length > 0 ? (
|
|
539
|
+
<>
|
|
540
|
+
<Spacer />
|
|
541
|
+
<ServicePanel
|
|
542
|
+
name="Workers"
|
|
543
|
+
items={workers.map((worker) => ({
|
|
544
|
+
label: worker.type,
|
|
545
|
+
value: `running · concurrency ${worker.concurrency}`,
|
|
546
|
+
}))}
|
|
547
|
+
/>
|
|
548
|
+
</>
|
|
549
|
+
) : null}
|
|
528
550
|
{warnings.length > 0 ? (
|
|
529
551
|
<>
|
|
530
552
|
<Spacer />
|
|
@@ -543,11 +565,13 @@ export function DevView({
|
|
|
543
565
|
export function WorkerView({
|
|
544
566
|
name,
|
|
545
567
|
workerId,
|
|
568
|
+
concurrency,
|
|
546
569
|
storage,
|
|
547
570
|
warnings = [],
|
|
548
571
|
}: {
|
|
549
572
|
name: string
|
|
550
573
|
workerId: string
|
|
574
|
+
concurrency: number
|
|
551
575
|
storage?: string | null
|
|
552
576
|
warnings?: readonly string[]
|
|
553
577
|
}) {
|
|
@@ -558,7 +582,13 @@ export function WorkerView({
|
|
|
558
582
|
</Text>
|
|
559
583
|
<Text dimColor>{name}</Text>
|
|
560
584
|
<Spacer />
|
|
561
|
-
<ServicePanel
|
|
585
|
+
<ServicePanel
|
|
586
|
+
name="Worker"
|
|
587
|
+
items={[
|
|
588
|
+
{ label: "ID", value: workerId },
|
|
589
|
+
{ label: "Concurrency", value: String(concurrency) },
|
|
590
|
+
]}
|
|
591
|
+
/>
|
|
562
592
|
<StoragePanel summary={storage} />
|
|
563
593
|
{warnings.length > 0 ? (
|
|
564
594
|
<>
|
|
@@ -575,12 +605,12 @@ export function WorkerView({
|
|
|
575
605
|
|
|
576
606
|
export function WorkerGroupView({
|
|
577
607
|
name,
|
|
578
|
-
|
|
608
|
+
workers,
|
|
579
609
|
storage,
|
|
580
610
|
warnings = [],
|
|
581
611
|
}: {
|
|
582
612
|
name: string
|
|
583
|
-
|
|
613
|
+
workers: readonly { readonly type: string; readonly concurrency: number }[]
|
|
584
614
|
storage?: string | null
|
|
585
615
|
warnings?: readonly string[]
|
|
586
616
|
}) {
|
|
@@ -593,7 +623,10 @@ export function WorkerGroupView({
|
|
|
593
623
|
<Spacer />
|
|
594
624
|
<ServicePanel
|
|
595
625
|
name="Workers"
|
|
596
|
-
items={
|
|
626
|
+
items={workers.map((worker) => ({
|
|
627
|
+
label: worker.type,
|
|
628
|
+
value: `running · concurrency ${worker.concurrency}`,
|
|
629
|
+
}))}
|
|
597
630
|
/>
|
|
598
631
|
<StoragePanel summary={storage} />
|
|
599
632
|
{warnings.length > 0 ? (
|