@they-juanreina/compost-cli 0.1.1 → 0.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/agreement.d.ts +3 -0
- package/dist/commands/agreement.d.ts.map +1 -0
- package/dist/commands/agreement.js +35 -0
- package/dist/commands/agreement.js.map +1 -0
- package/dist/commands/create.d.ts +1 -0
- package/dist/commands/create.d.ts.map +1 -1
- package/dist/commands/create.js +39 -1
- package/dist/commands/create.js.map +1 -1
- package/dist/commands/export.d.ts.map +1 -1
- package/dist/commands/export.js +47 -4
- package/dist/commands/export.js.map +1 -1
- package/dist/commands/import.d.ts +3 -0
- package/dist/commands/import.d.ts.map +1 -0
- package/dist/commands/import.js +59 -0
- package/dist/commands/import.js.map +1 -0
- package/dist/commands/init.d.ts.map +1 -1
- package/dist/commands/init.js +1 -0
- package/dist/commands/init.js.map +1 -1
- package/dist/commands/jobs.d.ts +3 -0
- package/dist/commands/jobs.d.ts.map +1 -0
- package/dist/commands/jobs.js +105 -0
- package/dist/commands/jobs.js.map +1 -0
- package/dist/commands/label.d.ts +3 -0
- package/dist/commands/label.d.ts.map +1 -0
- package/dist/commands/label.js +67 -0
- package/dist/commands/label.js.map +1 -0
- package/dist/commands/models.d.ts.map +1 -1
- package/dist/commands/models.js +2 -1
- package/dist/commands/models.js.map +1 -1
- package/dist/commands/recode.d.ts +3 -0
- package/dist/commands/recode.d.ts.map +1 -0
- package/dist/commands/recode.js +60 -0
- package/dist/commands/recode.js.map +1 -0
- package/dist/commands/reindex.d.ts.map +1 -1
- package/dist/commands/reindex.js +6 -4
- package/dist/commands/reindex.js.map +1 -1
- package/dist/commands/rerun.d.ts +3 -0
- package/dist/commands/rerun.d.ts.map +1 -0
- package/dist/commands/rerun.js +91 -0
- package/dist/commands/rerun.js.map +1 -0
- package/dist/commands/search.d.ts.map +1 -1
- package/dist/commands/search.js +2 -1
- package/dist/commands/search.js.map +1 -1
- package/dist/commands/secrets.d.ts +3 -0
- package/dist/commands/secrets.d.ts.map +1 -0
- package/dist/commands/secrets.js +143 -0
- package/dist/commands/secrets.js.map +1 -0
- package/dist/commands/setup.d.ts.map +1 -1
- package/dist/commands/setup.js +90 -1
- package/dist/commands/setup.js.map +1 -1
- package/dist/commands/status.d.ts.map +1 -1
- package/dist/commands/status.js +2 -1
- package/dist/commands/status.js.map +1 -1
- package/dist/commands/transcribe.d.ts.map +1 -1
- package/dist/commands/transcribe.js +13 -2
- package/dist/commands/transcribe.js.map +1 -1
- package/dist/commands/validate.d.ts.map +1 -1
- package/dist/commands/validate.js +29 -1
- package/dist/commands/validate.js.map +1 -1
- package/dist/engine.d.ts +23 -0
- package/dist/engine.d.ts.map +1 -0
- package/dist/engine.js +32 -0
- package/dist/engine.js.map +1 -0
- package/dist/exporters/prov.d.ts +11 -0
- package/dist/exporters/prov.d.ts.map +1 -0
- package/dist/exporters/prov.js +151 -0
- package/dist/exporters/prov.js.map +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -0
- package/dist/index.js.map +1 -1
- package/dist/lib/agreement.d.ts +77 -0
- package/dist/lib/agreement.d.ts.map +1 -0
- package/dist/lib/agreement.js +261 -0
- package/dist/lib/agreement.js.map +1 -0
- package/dist/lib/artifacts.d.ts +32 -1
- package/dist/lib/artifacts.d.ts.map +1 -1
- package/dist/lib/artifacts.js +156 -22
- package/dist/lib/artifacts.js.map +1 -1
- package/dist/lib/blame.d.ts.map +1 -1
- package/dist/lib/blame.js +3 -2
- package/dist/lib/blame.js.map +1 -1
- package/dist/lib/config.d.ts +3 -0
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/doctor.d.ts +3 -0
- package/dist/lib/doctor.d.ts.map +1 -1
- package/dist/lib/doctor.js +24 -1
- package/dist/lib/doctor.js.map +1 -1
- package/dist/lib/events.d.ts +34 -1
- package/dist/lib/events.d.ts.map +1 -1
- package/dist/lib/events.js +35 -1
- package/dist/lib/events.js.map +1 -1
- package/dist/lib/importTranscript.d.ts +16 -0
- package/dist/lib/importTranscript.d.ts.map +1 -0
- package/dist/lib/importTranscript.js +94 -0
- package/dist/lib/importTranscript.js.map +1 -0
- package/dist/lib/ingest.d.ts.map +1 -1
- package/dist/lib/ingest.js +12 -6
- package/dist/lib/ingest.js.map +1 -1
- package/dist/lib/journal.d.ts +13 -0
- package/dist/lib/journal.d.ts.map +1 -1
- package/dist/lib/journal.js +58 -2
- package/dist/lib/journal.js.map +1 -1
- package/dist/lib/legacyNative.d.ts +24 -0
- package/dist/lib/legacyNative.d.ts.map +1 -0
- package/dist/lib/legacyNative.js +51 -0
- package/dist/lib/legacyNative.js.map +1 -0
- package/dist/lib/migrate.d.ts.map +1 -1
- package/dist/lib/migrate.js +1 -0
- package/dist/lib/migrate.js.map +1 -1
- package/dist/lib/nativeRuntime.d.ts +6 -3
- package/dist/lib/nativeRuntime.d.ts.map +1 -1
- package/dist/lib/nativeRuntime.js +6 -3
- package/dist/lib/nativeRuntime.js.map +1 -1
- package/dist/lib/provisionNative.js +1 -1
- package/dist/lib/provisionNative.js.map +1 -1
- package/dist/lib/queue.d.ts +25 -0
- package/dist/lib/queue.d.ts.map +1 -1
- package/dist/lib/queue.js +70 -3
- package/dist/lib/queue.js.map +1 -1
- package/dist/lib/reads.d.ts +24 -0
- package/dist/lib/reads.d.ts.map +1 -0
- package/dist/lib/reads.js +115 -0
- package/dist/lib/reads.js.map +1 -0
- package/dist/lib/recode.d.ts +19 -0
- package/dist/lib/recode.d.ts.map +1 -0
- package/dist/lib/recode.js +43 -0
- package/dist/lib/recode.js.map +1 -0
- package/dist/lib/rerun.d.ts +51 -0
- package/dist/lib/rerun.d.ts.map +1 -0
- package/dist/lib/rerun.js +166 -0
- package/dist/lib/rerun.js.map +1 -0
- package/dist/lib/retrieve.d.ts +8 -4
- package/dist/lib/retrieve.d.ts.map +1 -1
- package/dist/lib/retrieve.js +12 -10
- package/dist/lib/retrieve.js.map +1 -1
- package/dist/lib/schemas.generated.d.ts.map +1 -1
- package/dist/lib/schemas.generated.js +28 -0
- package/dist/lib/schemas.generated.js.map +1 -1
- package/dist/lib/secrets.d.ts +158 -0
- package/dist/lib/secrets.d.ts.map +1 -0
- package/dist/lib/secrets.js +507 -0
- package/dist/lib/secrets.js.map +1 -0
- package/dist/lib/seed.d.ts +5 -0
- package/dist/lib/seed.d.ts.map +1 -1
- package/dist/lib/seed.js +15 -2
- package/dist/lib/seed.js.map +1 -1
- package/dist/lib/seedResolve.d.ts.map +1 -1
- package/dist/lib/seedResolve.js +1 -0
- package/dist/lib/seedResolve.js.map +1 -1
- package/dist/lib/session.d.ts +14 -0
- package/dist/lib/session.d.ts.map +1 -1
- package/dist/lib/session.js +47 -0
- package/dist/lib/session.js.map +1 -1
- package/dist/lib/setup.d.ts +5 -0
- package/dist/lib/setup.d.ts.map +1 -1
- package/dist/lib/setup.js +78 -14
- package/dist/lib/setup.js.map +1 -1
- package/dist/lib/setupWizard.d.ts +51 -0
- package/dist/lib/setupWizard.d.ts.map +1 -0
- package/dist/lib/setupWizard.js +223 -0
- package/dist/lib/setupWizard.js.map +1 -0
- package/dist/lib/snap.d.ts.map +1 -1
- package/dist/lib/snap.js +2 -5
- package/dist/lib/snap.js.map +1 -1
- package/dist/lib/speakers.d.ts +41 -0
- package/dist/lib/speakers.d.ts.map +1 -0
- package/dist/lib/speakers.js +78 -0
- package/dist/lib/speakers.js.map +1 -0
- package/dist/lib/status.d.ts.map +1 -1
- package/dist/lib/status.js +21 -0
- package/dist/lib/status.js.map +1 -1
- package/dist/lib/userConfig.d.ts +22 -0
- package/dist/lib/userConfig.d.ts.map +1 -0
- package/dist/lib/userConfig.js +67 -0
- package/dist/lib/userConfig.js.map +1 -0
- package/dist/lib/validate.d.ts +18 -0
- package/dist/lib/validate.d.ts.map +1 -1
- package/dist/lib/validate.js +70 -1
- package/dist/lib/validate.js.map +1 -1
- package/dist/lib/version.d.ts +30 -0
- package/dist/lib/version.d.ts.map +1 -0
- package/dist/lib/version.js +73 -0
- package/dist/lib/version.js.map +1 -0
- package/dist/llm/adapter.d.ts.map +1 -1
- package/dist/llm/adapter.js +2 -0
- package/dist/llm/adapter.js.map +1 -1
- package/dist/llm/providers/ollama.d.ts.map +1 -1
- package/dist/llm/providers/ollama.js +6 -0
- package/dist/llm/providers/ollama.js.map +1 -1
- package/dist/loops/ingest_watcher.d.ts.map +1 -1
- package/dist/loops/ingest_watcher.js +6 -3
- package/dist/loops/ingest_watcher.js.map +1 -1
- package/dist/loops/legacy_worker.d.ts +28 -1
- package/dist/loops/legacy_worker.d.ts.map +1 -1
- package/dist/loops/legacy_worker.js +81 -9
- package/dist/loops/legacy_worker.js.map +1 -1
- package/dist/loops/supervisor.d.ts +3 -0
- package/dist/loops/supervisor.d.ts.map +1 -1
- package/dist/loops/supervisor.js +12 -0
- package/dist/loops/supervisor.js.map +1 -1
- package/dist/loops/synthesis.d.ts.map +1 -1
- package/dist/loops/synthesis.js +15 -0
- package/dist/loops/synthesis.js.map +1 -1
- package/dist/loops/transcribe_worker.d.ts.map +1 -1
- package/dist/loops/transcribe_worker.js +2 -4
- package/dist/loops/transcribe_worker.js.map +1 -1
- package/dist/output.d.ts +13 -1
- package/dist/output.d.ts.map +1 -1
- package/dist/output.js +22 -2
- package/dist/output.js.map +1 -1
- package/dist/render/human.d.ts +20 -0
- package/dist/render/human.d.ts.map +1 -0
- package/dist/render/human.js +54 -0
- package/dist/render/human.js.map +1 -0
- package/dist/router.d.ts.map +1 -1
- package/dist/router.js +17 -2
- package/dist/router.js.map +1 -1
- package/package.json +18 -5
- package/templates/config.toml +6 -1
- package/transcriber/app/__init__.py +3 -0
- package/transcriber/app/asr.py +198 -0
- package/transcriber/app/asr_parakeet.py +174 -0
- package/transcriber/app/cue_parser.py +110 -0
- package/transcriber/app/diarization.py +330 -0
- package/transcriber/app/frame_annotation.py +77 -0
- package/transcriber/app/frames.py +130 -0
- package/transcriber/app/health.py +70 -0
- package/transcriber/app/legacy.py +355 -0
- package/transcriber/app/legacy_cli.py +90 -0
- package/transcriber/app/main.py +30 -0
- package/transcriber/app/pipeline.py +210 -0
- package/transcriber/app/pptx_export.py +42 -0
- package/transcriber/app/prosody.py +128 -0
- package/transcriber/app/routes/__init__.py +1 -0
- package/transcriber/app/routes/legacy.py +117 -0
- package/transcriber/app/routes/transcribe.py +133 -0
- package/transcriber/app/shot_change.py +74 -0
- package/transcriber/app/silence_typer.py +144 -0
- package/transcriber/app/transcribe_cli.py +82 -0
- package/transcriber/app/vad.py +216 -0
- package/transcriber/pyproject.toml +56 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/llm/adapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAA+C,MAAM,kBAAkB,CAAA;AAKlG,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,aAAa,EACb,SAAS,EACT,QAAQ,EACR,cAAc,EACf,MAAM,YAAY,CAAA;AAEnB,MAAM,WAAW,cAAc;IAC7B,4EAA4E;IAC5E,SAAS,CAAC,EAAE,SAAS,CAAA;CACtB;AAED,qBAAa,UAAU;IAInB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAJvB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA8B;gBAGrC,MAAM,EAAE,aAAa,EACrB,IAAI,GAAE,cAAmB;IAG5C,4DAA4D;IAC5D,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ;
|
|
1
|
+
{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/llm/adapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,aAAa,EAA+C,MAAM,kBAAkB,CAAA;AAKlG,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,aAAa,EACb,SAAS,EACT,QAAQ,EACR,cAAc,EACf,MAAM,YAAY,CAAA;AAEnB,MAAM,WAAW,cAAc;IAC7B,4EAA4E;IAC5E,SAAS,CAAC,EAAE,SAAS,CAAA;CACtB;AAED,qBAAa,UAAU;IAInB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,IAAI;IAJvB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA8B;gBAGrC,MAAM,EAAE,aAAa,EACrB,IAAI,GAAE,cAAmB;IAG5C,4DAA4D;IAC5D,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ;IAmCnC,4EAA4E;IAC5E,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAQxD,IAAI,CACR,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,WAAW,EAAE,EACvB,KAAK,GAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAO,GACzF,OAAO,CAAC,YAAY,CAAC;IAMlB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;IAMlE;;;gDAG4C;IAC5C,OAAO,CAAC,oBAAoB;IAW5B,oFAAoF;IAC9E,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;CA0B3D"}
|
package/dist/llm/adapter.js
CHANGED
|
@@ -19,9 +19,11 @@ export class LLMAdapter {
|
|
|
19
19
|
return cached;
|
|
20
20
|
const baseUrl = providerBaseUrl(this.config, name);
|
|
21
21
|
const apiKey = providerApiKey(this.config, name);
|
|
22
|
+
const timeoutMs = this.config.providers[name]?.timeout_ms;
|
|
22
23
|
const cfg = {
|
|
23
24
|
baseUrl,
|
|
24
25
|
...(apiKey !== undefined ? { apiKey } : {}),
|
|
26
|
+
...(timeoutMs !== undefined ? { timeoutMs } : {}),
|
|
25
27
|
...(this.opts.fetchImpl ? { fetchImpl: this.opts.fetchImpl } : {}),
|
|
26
28
|
};
|
|
27
29
|
let provider;
|
package/dist/llm/adapter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/llm/adapter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"adapter.js","sourceRoot":"","sources":["../../src/llm/adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.d.ts","sourceRoot":"","sources":["../../../src/llm/providers/ollama.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,aAAa,EAEb,QAAQ,EACR,cAAc,EACd,cAAc,EACf,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"ollama.d.ts","sourceRoot":"","sources":["../../../src/llm/providers/ollama.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,aAAa,EAEb,QAAQ,EACR,cAAc,EACd,cAAc,EACf,MAAM,aAAa,CAAA;AAkCpB,qBAAa,cAAe,YAAW,QAAQ;IAC7C,QAAQ,CAAC,IAAI,YAAW;IACxB,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAQ;IAC7B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;gBAEtB,MAAM,EAAE,cAAc;IAM5B,IAAI,CAAC,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC;IA4B7C,KAAK,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;IAoBhD,MAAM,IAAI,OAAO,CAAC,cAAc,CAAC;CAcxC"}
|
|
@@ -13,6 +13,12 @@ import { getJsonTimed, postJson, resolveFetch } from '../http.js';
|
|
|
13
13
|
function translateOllamaError(err, model) {
|
|
14
14
|
if (!(err instanceof Error))
|
|
15
15
|
return new Error(String(err));
|
|
16
|
+
// A timed-out request surfaces as a bare AbortError ("This operation was
|
|
17
|
+
// aborted") — unactionable. Big local models routinely need >120s just to
|
|
18
|
+
// load into memory on first use, so name the model and the two ways out.
|
|
19
|
+
if (err.name === 'AbortError' || /operation was aborted/i.test(err.message)) {
|
|
20
|
+
return new CompostError('PROVIDER_ERROR', `Ollama model '${model}' did not answer within the timeout — large models can take minutes to load on first use. Route the task to a smaller model (\`compost setup\` configures one), or raise providers.ollama.timeout_ms in config.toml.`, { cause: err });
|
|
21
|
+
}
|
|
16
22
|
// postJson formats: `POST <url> → <status> <statusText>: <bodyPrefix>`
|
|
17
23
|
if (!/→ 404 /.test(err.message))
|
|
18
24
|
return err;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.js","sourceRoot":"","sources":["../../../src/llm/providers/ollama.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ollama.js","sourceRoot":"","sources":["../../../src/llm/providers/ollama.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ingest_watcher.d.ts","sourceRoot":"","sources":["../../src/loops/ingest_watcher.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAC9E,WAAW,EAAE,MAAM,EAAE,CAAA;CACtB;AAUD;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,oBAAoB,
|
|
1
|
+
{"version":3,"file":"ingest_watcher.d.ts","sourceRoot":"","sources":["../../src/loops/ingest_watcher.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IAC9E,WAAW,EAAE,MAAM,EAAE,CAAA;CACtB;AAUD;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,oBAAoB,CA4CnE"}
|
|
@@ -2,7 +2,7 @@ import { existsSync, mkdirSync, readdirSync, renameSync, statSync } from 'node:f
|
|
|
2
2
|
import { basename, extname, join } from 'node:path';
|
|
3
3
|
import { classify } from '../lib/dispatch.js';
|
|
4
4
|
import { emitAgentCreate, openSeedEvents } from '../lib/events.js';
|
|
5
|
-
import { JobQueue, stateDbPath } from '../lib/queue.js';
|
|
5
|
+
import { JobQueue, stateDbPath, toSeedRelative } from '../lib/queue.js';
|
|
6
6
|
const AGENT_NAME = 'ingest-watcher';
|
|
7
7
|
const AGENT_VERSION = '0.1.0';
|
|
8
8
|
function nextSessionId(sessionsDir) {
|
|
@@ -43,14 +43,17 @@ export function processInbox(seedPath) {
|
|
|
43
43
|
mkdirSync(sessionDir, { recursive: true });
|
|
44
44
|
const to = join(sessionDir, `source${extname(entry).toLowerCase()}`);
|
|
45
45
|
renameSync(from, to); // atomic within the same filesystem
|
|
46
|
-
|
|
46
|
+
// Stored seed-relative so the queue and event log survive the study
|
|
47
|
+
// folder being moved or renamed in Finder (#240).
|
|
48
|
+
const relTo = toSeedRelative(seedPath, to);
|
|
49
|
+
const { id } = queue.enqueue(d.kind, relTo, {
|
|
47
50
|
category: d.category,
|
|
48
51
|
session_id: sid,
|
|
49
52
|
original_name: basename(entry),
|
|
50
53
|
});
|
|
51
54
|
emitAgentCreate(events, {
|
|
52
55
|
artifactKind: 'session',
|
|
53
|
-
initialState: { session_id: sid, source:
|
|
56
|
+
initialState: { session_id: sid, source: relTo, kind: d.kind },
|
|
54
57
|
agentName: AGENT_NAME,
|
|
55
58
|
agentVersion: AGENT_VERSION,
|
|
56
59
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ingest_watcher.js","sourceRoot":"","sources":["../../src/loops/ingest_watcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAA;AAClF,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEnD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAC7C,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAClE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"ingest_watcher.js","sourceRoot":"","sources":["../../src/loops/ingest_watcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { LegacyIngestClient } from '../legacy_client.js';
|
|
1
|
+
import { LegacyIngestClient, type LegacyIngestRequest, type LegacyIngestResponse } from '../legacy_client.js';
|
|
2
2
|
export interface LegacyWorkerResult {
|
|
3
3
|
processed: number;
|
|
4
4
|
results: Array<{
|
|
@@ -6,12 +6,39 @@ export interface LegacyWorkerResult {
|
|
|
6
6
|
source_path: string;
|
|
7
7
|
status: string;
|
|
8
8
|
normalized_path?: string;
|
|
9
|
+
transcript_path?: string;
|
|
9
10
|
utterance_count?: number;
|
|
10
11
|
warnings?: string[];
|
|
11
12
|
}>;
|
|
12
13
|
}
|
|
14
|
+
export interface LinkedDoc {
|
|
15
|
+
/** Final location of the normalized copy under legacy/. */
|
|
16
|
+
normalized_path: string;
|
|
17
|
+
/** sessions/<sid>/transcript.json when the doc was linked into its session. */
|
|
18
|
+
transcript_path?: string;
|
|
19
|
+
warnings: string[];
|
|
20
|
+
}
|
|
21
|
+
/**
|
|
22
|
+
* Place a freshly-normalized document where the rest of the pipeline expects
|
|
23
|
+
* it (#246): rename the `legacy/` copy after the researcher's original
|
|
24
|
+
* filename (the inbox move renamed the source to `source.<ext>`, so the
|
|
25
|
+
* service output otherwise collides at `legacy/source.json` for every
|
|
26
|
+
* session), and link it into its session as `transcript.json` so search and
|
|
27
|
+
* embeddings pick it up without the manual `cp` step the wiki used to ask
|
|
28
|
+
* for. Non-inbox jobs (no `S\d+` session id) only get the rename.
|
|
29
|
+
*/
|
|
30
|
+
export declare function linkNormalizedDoc(seedPath: string, payload: {
|
|
31
|
+
session_id?: unknown;
|
|
32
|
+
original_name?: unknown;
|
|
33
|
+
}, normalizedPath: string): LinkedDoc;
|
|
34
|
+
/** Ingests one legacy asset and returns the normalized result. The default
|
|
35
|
+
* runner prefers the native path (#184) when a Python venv + transcriber dir
|
|
36
|
+
* resolve, falling back to the Docker /legacy-ingest route otherwise. */
|
|
37
|
+
export type LegacyRunner = (req: LegacyIngestRequest) => Promise<LegacyIngestResponse>;
|
|
13
38
|
export interface LegacyWorkerDeps {
|
|
14
39
|
client?: LegacyIngestClient;
|
|
40
|
+
/** Override the ingest runner (tests). */
|
|
41
|
+
runner?: LegacyRunner;
|
|
15
42
|
}
|
|
16
43
|
/**
|
|
17
44
|
* Drain all queued `legacy-ingest` jobs (PDF/DOCX/PPTX/CSV/MD/TXT/XLSX).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"legacy_worker.d.ts","sourceRoot":"","sources":["../../src/loops/legacy_worker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"legacy_worker.d.ts","sourceRoot":"","sources":["../../src/loops/legacy_worker.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,kBAAkB,EAClB,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EAE1B,MAAM,qBAAqB,CAAA;AA6C5B,MAAM,WAAW,kBAAkB;IACjC,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,KAAK,CAAC;QACb,MAAM,EAAE,MAAM,CAAA;QACd,WAAW,EAAE,MAAM,CAAA;QACnB,MAAM,EAAE,MAAM,CAAA;QACd,eAAe,CAAC,EAAE,MAAM,CAAA;QACxB,eAAe,CAAC,EAAE,MAAM,CAAA;QACxB,eAAe,CAAC,EAAE,MAAM,CAAA;QACxB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;KACpB,CAAC,CAAA;CACH;AAED,MAAM,WAAW,SAAS;IACxB,2DAA2D;IAC3D,eAAe,EAAE,MAAM,CAAA;IACvB,+EAA+E;IAC/E,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,EAAE,MAAM,EAAE,CAAA;CACnB;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE;IAAE,UAAU,CAAC,EAAE,OAAO,CAAC;IAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CAAE,EAC1D,cAAc,EAAE,MAAM,GACrB,SAAS,CA6CX;AAED;;yEAEyE;AACzE,MAAM,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE,mBAAmB,KAAK,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAEtF,MAAM,WAAW,gBAAgB;IAC/B,MAAM,CAAC,EAAE,kBAAkB,CAAA;IAC3B,0CAA0C;IAC1C,MAAM,CAAC,EAAE,YAAY,CAAA;CACtB;AAaD;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,gBAAqB,GAC1B,OAAO,CAAC,kBAAkB,CAAC,CAsE7B"}
|
|
@@ -1,10 +1,13 @@
|
|
|
1
|
-
import { existsSync, readFileSync } from 'node:fs';
|
|
1
|
+
import { existsSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
|
|
2
|
+
import { basename, extname, join } from 'node:path';
|
|
2
3
|
import { LegacyIngestClient, LegacyServiceError, } from '../legacy_client.js';
|
|
3
4
|
import { emitAgentCreate, openSeedEvents } from '../lib/events.js';
|
|
4
|
-
import {
|
|
5
|
+
import { legacyIngestNative } from '../lib/legacyNative.js';
|
|
6
|
+
import { resolveNativeRuntime } from '../lib/nativeRuntime.js';
|
|
7
|
+
import { JobQueue, MAX_ATTEMPTS, resolveJobSource, stateDbPath } from '../lib/queue.js';
|
|
8
|
+
import { writeTranscriptMd } from '../render/transcript_md.js';
|
|
5
9
|
const AGENT_NAME = 'legacy-ingest-worker';
|
|
6
10
|
const AGENT_VERSION = '0.1.0';
|
|
7
|
-
const MAX_ATTEMPTS = 3;
|
|
8
11
|
function readSidecar(sourcePath) {
|
|
9
12
|
const sidecarPath = `${sourcePath}.compost.json`;
|
|
10
13
|
if (!existsSync(sidecarPath))
|
|
@@ -29,6 +32,63 @@ function readSidecar(sourcePath) {
|
|
|
29
32
|
return null;
|
|
30
33
|
}
|
|
31
34
|
}
|
|
35
|
+
/**
|
|
36
|
+
* Place a freshly-normalized document where the rest of the pipeline expects
|
|
37
|
+
* it (#246): rename the `legacy/` copy after the researcher's original
|
|
38
|
+
* filename (the inbox move renamed the source to `source.<ext>`, so the
|
|
39
|
+
* service output otherwise collides at `legacy/source.json` for every
|
|
40
|
+
* session), and link it into its session as `transcript.json` so search and
|
|
41
|
+
* embeddings pick it up without the manual `cp` step the wiki used to ask
|
|
42
|
+
* for. Non-inbox jobs (no `S\d+` session id) only get the rename.
|
|
43
|
+
*/
|
|
44
|
+
export function linkNormalizedDoc(seedPath, payload, normalizedPath) {
|
|
45
|
+
const warnings = [];
|
|
46
|
+
let finalNormalized = normalizedPath;
|
|
47
|
+
const sid = typeof payload.session_id === 'string' ? payload.session_id : undefined;
|
|
48
|
+
const original = typeof payload.original_name === 'string' ? payload.original_name : undefined;
|
|
49
|
+
if (original !== undefined && existsSync(normalizedPath)) {
|
|
50
|
+
const stem = basename(original, extname(original)).replace(/[^\w.-]+/g, '_');
|
|
51
|
+
const target = join(seedPath, 'legacy', sid !== undefined ? `${sid}-${stem}.json` : `${stem}.json`);
|
|
52
|
+
if (target !== normalizedPath) {
|
|
53
|
+
renameSync(normalizedPath, target);
|
|
54
|
+
finalNormalized = target;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
if (sid !== undefined && /^S\d+$/.test(sid) && existsSync(finalNormalized)) {
|
|
58
|
+
const sessionDir = join(seedPath, 'sessions', sid);
|
|
59
|
+
const transcriptPath = join(sessionDir, 'transcript.json');
|
|
60
|
+
if (!existsSync(sessionDir)) {
|
|
61
|
+
warnings.push(`session ${sid} has no directory — normalized doc left in legacy/ only`);
|
|
62
|
+
return { normalized_path: finalNormalized, warnings };
|
|
63
|
+
}
|
|
64
|
+
if (existsSync(transcriptPath)) {
|
|
65
|
+
warnings.push(`session ${sid} already has transcript.json — not overwritten`);
|
|
66
|
+
return { normalized_path: finalNormalized, warnings };
|
|
67
|
+
}
|
|
68
|
+
const doc = JSON.parse(readFileSync(finalNormalized, 'utf8'));
|
|
69
|
+
// The service derives session_id from the file basename ("DOC-source");
|
|
70
|
+
// the session's real id is what search/status/exports key on.
|
|
71
|
+
doc.session_id = sid;
|
|
72
|
+
writeFileSync(transcriptPath, `${JSON.stringify(doc, null, 2)}\n`, 'utf8');
|
|
73
|
+
try {
|
|
74
|
+
writeTranscriptMd(transcriptPath);
|
|
75
|
+
}
|
|
76
|
+
catch (err) {
|
|
77
|
+
warnings.push(`transcript.md render failed: ${err instanceof Error ? err.message : err}`);
|
|
78
|
+
}
|
|
79
|
+
return { normalized_path: finalNormalized, transcript_path: transcriptPath, warnings };
|
|
80
|
+
}
|
|
81
|
+
return { normalized_path: finalNormalized, warnings };
|
|
82
|
+
}
|
|
83
|
+
/** Native-first runner: shell out to `app.legacy_cli` when a native runtime
|
|
84
|
+
* resolves; else POST to the Docker fallback via the client. */
|
|
85
|
+
function defaultLegacyRunner(client) {
|
|
86
|
+
const native = resolveNativeRuntime();
|
|
87
|
+
if (native !== null) {
|
|
88
|
+
return async (req) => legacyIngestNative(req, { python: native.python, transcriberDir: native.transcriberDir });
|
|
89
|
+
}
|
|
90
|
+
return (req) => client.ingest(req);
|
|
91
|
+
}
|
|
32
92
|
/**
|
|
33
93
|
* Drain all queued `legacy-ingest` jobs (PDF/DOCX/PPTX/CSV/MD/TXT/XLSX).
|
|
34
94
|
* Each job is POSTed to the transcriber's /legacy-ingest route, which writes
|
|
@@ -39,7 +99,12 @@ function readSidecar(sourcePath) {
|
|
|
39
99
|
* failed status after MAX_ATTEMPTS.
|
|
40
100
|
*/
|
|
41
101
|
export async function runLegacyWorkerOnce(seedPath, deps = {}) {
|
|
42
|
-
|
|
102
|
+
// An injected client (tests / explicit Docker) wins. Otherwise, in production,
|
|
103
|
+
// prefer the native path and fall back to the Docker route.
|
|
104
|
+
const runner = deps.runner ??
|
|
105
|
+
(deps.client !== undefined
|
|
106
|
+
? (req) => deps.client.ingest(req)
|
|
107
|
+
: defaultLegacyRunner(new LegacyIngestClient()));
|
|
43
108
|
const queue = new JobQueue(stateDbPath(seedPath));
|
|
44
109
|
const events = openSeedEvents(seedPath);
|
|
45
110
|
const out = { processed: 0, results: [] };
|
|
@@ -49,7 +114,8 @@ export async function runLegacyWorkerOnce(seedPath, deps = {}) {
|
|
|
49
114
|
if (job === null)
|
|
50
115
|
break;
|
|
51
116
|
out.processed += 1;
|
|
52
|
-
|
|
117
|
+
// The service needs a real filesystem path; rows are stored seed-relative (#240).
|
|
118
|
+
const sourcePath = resolveJobSource(seedPath, job.source_path);
|
|
53
119
|
try {
|
|
54
120
|
const sidecar = readSidecar(sourcePath);
|
|
55
121
|
const ingestReq = {
|
|
@@ -59,13 +125,15 @@ export async function runLegacyWorkerOnce(seedPath, deps = {}) {
|
|
|
59
125
|
...(sidecar?.speaker_col !== undefined ? { speaker_col: sidecar.speaker_col } : {}),
|
|
60
126
|
...(sidecar?.sheet !== undefined ? { sheet: sidecar.sheet } : {}),
|
|
61
127
|
};
|
|
62
|
-
const resp = await
|
|
128
|
+
const resp = await runner(ingestReq);
|
|
129
|
+
const linked = linkNormalizedDoc(seedPath, job.payload, resp.normalized_path);
|
|
63
130
|
queue.complete(job.id);
|
|
64
131
|
emitAgentCreate(events, {
|
|
65
132
|
artifactKind: 'legacy_chunk',
|
|
66
133
|
initialState: {
|
|
67
134
|
source_path: resp.source_path,
|
|
68
|
-
normalized_path:
|
|
135
|
+
normalized_path: linked.normalized_path,
|
|
136
|
+
transcript_path: linked.transcript_path ?? null,
|
|
69
137
|
utterance_count: resp.utterance_count,
|
|
70
138
|
status: resp.status,
|
|
71
139
|
text_col_resolved: resp.text_col_resolved ?? null,
|
|
@@ -74,13 +142,17 @@ export async function runLegacyWorkerOnce(seedPath, deps = {}) {
|
|
|
74
142
|
agentName: AGENT_NAME,
|
|
75
143
|
agentVersion: AGENT_VERSION,
|
|
76
144
|
});
|
|
145
|
+
const warnings = [...(resp.warnings ?? []), ...linked.warnings];
|
|
77
146
|
out.results.push({
|
|
78
147
|
job_id: job.id,
|
|
79
148
|
source_path: sourcePath,
|
|
80
149
|
status: resp.status,
|
|
81
|
-
normalized_path:
|
|
150
|
+
normalized_path: linked.normalized_path,
|
|
151
|
+
...(linked.transcript_path !== undefined
|
|
152
|
+
? { transcript_path: linked.transcript_path }
|
|
153
|
+
: {}),
|
|
82
154
|
utterance_count: resp.utterance_count,
|
|
83
|
-
...(
|
|
155
|
+
...(warnings.length > 0 ? { warnings } : {}),
|
|
84
156
|
});
|
|
85
157
|
}
|
|
86
158
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"legacy_worker.js","sourceRoot":"","sources":["../../src/loops/legacy_worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"legacy_worker.js","sourceRoot":"","sources":["../../src/loops/legacy_worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAC7E,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEnD,OAAO,EACL,kBAAkB,EAGlB,kBAAkB,GACnB,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAC9D,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAA;AAE9D,MAAM,UAAU,GAAG,sBAAsB,CAAA;AACzC,MAAM,aAAa,GAAG,OAAO,CAAA;AAkB7B,SAAS,WAAW,CAAC,UAAkB;IACrC,MAAM,WAAW,GAAG,GAAG,UAAU,eAAe,CAAA;IAChD,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC;QAAE,OAAO,IAAI,CAAA;IACzC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAY,CAAA;QACvE,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO,IAAI,CAAA;QAC9D,MAAM,GAAG,GAAmB,EAAE,CAAA;QAC9B,MAAM,CAAC,GAAG,MAAiC,CAAA;QAC3C,IAAI,OAAO,CAAC,CAAC,QAAQ,KAAK,QAAQ;YAAE,GAAG,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAA;QAC7D,IAAI,OAAO,CAAC,CAAC,WAAW,KAAK,QAAQ;YAAE,GAAG,CAAC,WAAW,GAAG,CAAC,CAAC,WAAW,CAAA;QACtE,IAAI,OAAO,CAAC,CAAC,KAAK,KAAK,QAAQ;YAAE,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAA;QACpD,OAAO,GAAG,CAAA;IACZ,CAAC;IAAC,MAAM,CAAC;QACP,wEAAwE;QACxE,yEAAyE;QACzE,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC;AAuBD;;;;;;;;GAQG;AACH,MAAM,UAAU,iBAAiB,CAC/B,QAAgB,EAChB,OAA0D,EAC1D,cAAsB;IAEtB,MAAM,QAAQ,GAAa,EAAE,CAAA;IAC7B,IAAI,eAAe,GAAG,cAAc,CAAA;IAEpC,MAAM,GAAG,GAAG,OAAO,OAAO,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAA;IACnF,MAAM,QAAQ,GAAG,OAAO,OAAO,CAAC,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAA;IAE9F,IAAI,QAAQ,KAAK,SAAS,IAAI,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QACzD,MAAM,IAAI,GAAG,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC,CAAA;QAC5E,MAAM,MAAM,GAAG,IAAI,CACjB,QAAQ,EACR,QAAQ,EACR,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,OAAO,CAC3D,CAAA;QACD,IAAI,MAAM,KAAK,cAAc,EAAE,CAAC;YAC9B,UAAU,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA;YAClC,eAAe,GAAG,MAAM,CAAA;QAC1B,CAAC;IACH,CAAC;IAED,IAAI,GAAG,KAAK,SAAS,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QAC3E,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,CAAC,CAAA;QAClD,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAA;QAC1D,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;YAC5B,QAAQ,CAAC,IAAI,CAAC,WAAW,GAAG,yDAAyD,CAAC,CAAA;YACtF,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,QAAQ,EAAE,CAAA;QACvD,CAAC;QACD,IAAI,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;YAC/B,QAAQ,CAAC,IAAI,CAAC,WAAW,GAAG,gDAAgD,CAAC,CAAA;YAC7E,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,QAAQ,EAAE,CAAA;QACvD,CAAC;QACD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,CAA4B,CAAA;QACxF,wEAAwE;QACxE,8DAA8D;QAC9D,GAAG,CAAC,UAAU,GAAG,GAAG,CAAA;QACpB,aAAa,CAAC,cAAc,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QAC1E,IAAI,CAAC;YACH,iBAAiB,CAAC,cAAc,CAAC,CAAA;QACnC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,QAAQ,CAAC,IAAI,CAAC,gCAAgC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAA;QAC3F,CAAC;QACD,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAA;IACxF,CAAC;IAED,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,QAAQ,EAAE,CAAA;AACvD,CAAC;AAaD;gEACgE;AAChE,SAAS,mBAAmB,CAAC,MAA0B;IACrD,MAAM,MAAM,GAAG,oBAAoB,EAAE,CAAA;IACrC,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QACpB,OAAO,KAAK,EAAE,GAAG,EAAE,EAAE,CACnB,kBAAkB,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,CAAC,cAAc,EAAE,CAAC,CAAA;IAC7F,CAAC;IACD,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;AACpC,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,QAAgB,EAChB,OAAyB,EAAE;IAE3B,+EAA+E;IAC/E,4DAA4D;IAC5D,MAAM,MAAM,GACV,IAAI,CAAC,MAAM;QACX,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS;YACxB,CAAC,CAAC,CAAC,GAAwB,EAAE,EAAE,CAAE,IAAI,CAAC,MAA6B,CAAC,MAAM,CAAC,GAAG,CAAC;YAC/E,CAAC,CAAC,mBAAmB,CAAC,IAAI,kBAAkB,EAAE,CAAC,CAAC,CAAA;IACpD,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAA;IACjD,MAAM,MAAM,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAA;IACvC,MAAM,GAAG,GAAuB,EAAE,SAAS,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAA;IAE7D,IAAI,CAAC;QACH,OAAO,IAAI,EAAE,CAAC;YACZ,MAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;YACxC,IAAI,GAAG,KAAK,IAAI;gBAAE,MAAK;YACvB,GAAG,CAAC,SAAS,IAAI,CAAC,CAAA;YAClB,kFAAkF;YAClF,MAAM,UAAU,GAAG,gBAAgB,CAAC,QAAQ,EAAE,GAAG,CAAC,WAAW,CAAC,CAAA;YAC9D,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC,CAAA;gBACvC,MAAM,SAAS,GAAwB;oBACrC,SAAS,EAAE,QAAQ;oBACnB,WAAW,EAAE,UAAU;oBACvB,GAAG,CAAC,OAAO,EAAE,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC1E,GAAG,CAAC,OAAO,EAAE,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBACnF,GAAG,CAAC,OAAO,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAClE,CAAA;gBACD,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,CAAA;gBACpC,MAAM,MAAM,GAAG,iBAAiB,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,CAAA;gBAC7E,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;gBACtB,eAAe,CAAC,MAAM,EAAE;oBACtB,YAAY,EAAE,cAAc;oBAC5B,YAAY,EAAE;wBACZ,WAAW,EAAE,IAAI,CAAC,WAAW;wBAC7B,eAAe,EAAE,MAAM,CAAC,eAAe;wBACvC,eAAe,EAAE,MAAM,CAAC,eAAe,IAAI,IAAI;wBAC/C,eAAe,EAAE,IAAI,CAAC,eAAe;wBACrC,MAAM,EAAE,IAAI,CAAC,MAAM;wBACnB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,IAAI,IAAI;wBACjD,eAAe,EAAE,OAAO,KAAK,IAAI;qBAClC;oBACD,SAAS,EAAE,UAAU;oBACrB,YAAY,EAAE,aAAa;iBAC5B,CAAC,CAAA;gBACF,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAA;gBAC/D,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC;oBACf,MAAM,EAAE,GAAG,CAAC,EAAE;oBACd,WAAW,EAAE,UAAU;oBACvB,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,eAAe,EAAE,MAAM,CAAC,eAAe;oBACvC,GAAG,CAAC,MAAM,CAAC,eAAe,KAAK,SAAS;wBACtC,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC,eAAe,EAAE;wBAC7C,CAAC,CAAC,EAAE,CAAC;oBACP,eAAe,EAAE,IAAI,CAAC,eAAe;oBACrC,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC7C,CAAC,CAAA;YACJ,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;gBAC5D,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,YAAY,CAAC,CAAA;gBACrC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAA;gBAC9E,mEAAmE;gBACnE,IAAI,GAAG,YAAY,kBAAkB,IAAI,GAAG,CAAC,IAAI,KAAK,MAAM;oBAAE,MAAK;YACrE,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;YAAS,CAAC;QACT,KAAK,CAAC,KAAK,EAAE,CAAA;QACb,MAAM,CAAC,KAAK,EAAE,CAAA;IAChB,CAAC;AACH,CAAC"}
|
|
@@ -19,6 +19,9 @@ export interface SupervisorResult {
|
|
|
19
19
|
inserted: number;
|
|
20
20
|
transcripts_scanned: number;
|
|
21
21
|
};
|
|
22
|
+
/** Jobs that exhausted their attempt budget and sit permanently failed in the
|
|
23
|
+
* queue — nothing will pick them up until `compost jobs requeue` (#239). */
|
|
24
|
+
dead_jobs: number;
|
|
22
25
|
/** Human-readable failure summaries; empty when the pass was clean. The watch
|
|
23
26
|
* command turns a non-empty list into a non-ok status + non-zero exit (#164). */
|
|
24
27
|
failures: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supervisor.d.ts","sourceRoot":"","sources":["../../src/loops/supervisor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"supervisor.d.ts","sourceRoot":"","sources":["../../src/loops/supervisor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,eAAe,EAAsB,MAAM,mBAAmB,CAAA;AAE5E,OAAO,EAAE,KAAK,gBAAgB,EAAuB,MAAM,oBAAoB,CAAA;AAC/E,OAAO,EAA2B,KAAK,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAEjF,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAA;IAC7C,UAAU,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAA;IACjD,MAAM,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAA;IAC7C,KAAK,EAAE;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,mBAAmB,EAAE,MAAM,CAAA;KAAE,CAAA;IAC1E;gFAC4E;IAC5E,SAAS,EAAE,MAAM,CAAA;IACjB;qFACiF;IACjF,QAAQ,EAAE,MAAM,EAAE,CAAA;CACnB;AAED,oFAAoF;AACpF,wBAAgB,cAAc,CAAC,CAAC,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAE7D;AAED;;mBAEmB;AACnB,wBAAgB,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,MAAM,CAE1F;AAED,MAAM,WAAW,cAAe,SAAQ,UAAU;IAChD,MAAM,CAAC,EAAE,gBAAgB,CAAA;IACzB,KAAK,CAAC,EAAE,eAAe,CAAA;IACvB,0FAA0F;IAC1F,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,iFAAiF;IACjF,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,cAAmB,GACxB,OAAO,CAAC,gBAAgB,CAAC,CA6D3B;AAQD,mFAAmF;AACnF,wBAAgB,eAAe,CAAC,WAAW,SAAI,EAAE,MAAM,SAAM,GAAG,MAAM,EAAE,CAEvE;AAED,MAAM,WAAW,cAAe,SAAQ,UAAU;IAChD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,OAAO,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,KAAK,IAAI,CAAA;CAC/C;AAED;;;;GAIG;AACH,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,GAAE,cAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBxF"}
|
package/dist/loops/supervisor.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { JobQueue, MAX_ATTEMPTS, stateDbPath } from '../lib/queue.js';
|
|
1
2
|
import { getLogPath, Logger } from '../logging.js';
|
|
2
3
|
import { runEmbedWorkerOnce } from './embed_worker.js';
|
|
3
4
|
import { processInbox } from './ingest_watcher.js';
|
|
@@ -67,11 +68,21 @@ export async function runSupervisorOnce(seedPath, deps = {}) {
|
|
|
67
68
|
await logger.error('embed failed', { error: String(err) });
|
|
68
69
|
}
|
|
69
70
|
}
|
|
71
|
+
// Given-up jobs (status 'failed' after MAX_ATTEMPTS) are skipped by claim(),
|
|
72
|
+
// so without this a pass over a dead queue reports ok forever (#239).
|
|
73
|
+
const queue = new JobQueue(stateDbPath(seedPath));
|
|
74
|
+
const deadJobs = queue.counts().failed;
|
|
75
|
+
queue.close();
|
|
76
|
+
if (deadJobs > 0) {
|
|
77
|
+
failures.push(`${deadJobs} job(s) permanently failed after ${MAX_ATTEMPTS} attempts — run \`compost jobs\` to inspect and \`compost jobs requeue\` to retry`);
|
|
78
|
+
await logger.warn('dead jobs in queue', { count: deadJobs });
|
|
79
|
+
}
|
|
70
80
|
return {
|
|
71
81
|
inbox: { moved: inbox.moved.length, unsupported: inbox.unsupported.length },
|
|
72
82
|
transcribe: { processed: worker.processed, failed: transcribeFailed },
|
|
73
83
|
legacy,
|
|
74
84
|
embed,
|
|
85
|
+
dead_jobs: deadJobs,
|
|
75
86
|
failures,
|
|
76
87
|
};
|
|
77
88
|
}
|
|
@@ -103,6 +114,7 @@ export async function runLive(seedPath, opts = {}) {
|
|
|
103
114
|
opts.onError?.('supervisor', err);
|
|
104
115
|
if (attempt >= backoff.length)
|
|
105
116
|
break;
|
|
117
|
+
// biome-ignore lint/style/noNonNullAssertion: guard above guarantees attempt is in bounds for backoff
|
|
106
118
|
await sleep(backoff[attempt], opts.signal);
|
|
107
119
|
attempt += 1;
|
|
108
120
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../../src/loops/supervisor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAClD,OAAO,EAAwB,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAyB,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAC/E,OAAO,EAAE,uBAAuB,EAAmB,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../../src/loops/supervisor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAClD,OAAO,EAAwB,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAyB,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAC/E,OAAO,EAAE,uBAAuB,EAAmB,MAAM,wBAAwB,CAAA;AAejF,oFAAoF;AACpF,MAAM,UAAU,cAAc,CAAC,CAAqB;IAClD,OAAO,CAAC,CAAC,MAAM,KAAK,OAAO,IAAI,CAAC,CAAC,MAAM,KAAK,sBAAsB,CAAA;AACpE,CAAC;AAED;;mBAEmB;AACnB,MAAM,UAAU,eAAe,CAAC,OAAkD;IAChF,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAA;AAC1E,CAAC;AAWD;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,QAAgB,EAChB,OAAuB,EAAE;IAEzB,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAA;IACjD,MAAM,QAAQ,GAAa,EAAE,CAAA;IAC7B,MAAM,KAAK,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAA;IACpC,MAAM,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE;QACjC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM;QACzB,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,MAAM;KACtC,CAAC,CAAA;IACF,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;IAC5D,MAAM,gBAAgB,GAAG,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IACxD,IAAI,gBAAgB,GAAG,CAAC;QAAE,QAAQ,CAAC,IAAI,CAAC,eAAe,gBAAgB,gBAAgB,CAAC,CAAA;IACxF,MAAM,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC,CAAA;IAElG,IAAI,MAAM,GAAG,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAA;IACxC,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI,EAAE,CAAC;QAC7B,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAA;YACrE,MAAM,MAAM,GAAG,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;YAC9C,MAAM,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,CAAA;YAChD,IAAI,MAAM,GAAG,CAAC;gBAAE,QAAQ,CAAC,IAAI,CAAC,WAAW,MAAM,gBAAgB,CAAC,CAAA;YAChE,MAAM,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAA;QAC7C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,6EAA6E;YAC7E,QAAQ,CAAC,IAAI,CAAC,WAAW,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;YACvC,MAAM,MAAM,CAAC,KAAK,CAAC,eAAe,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QAC7D,CAAC;IACH,CAAC;IAED,IAAI,KAAK,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,mBAAmB,EAAE,CAAC,EAAE,CAAA;IAChE,IAAI,IAAI,CAAC,SAAS,KAAK,IAAI,EAAE,CAAC;QAC5B,IAAI,CAAC;YACH,KAAK,GAAG,MAAM,kBAAkB,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAA;YAC5D,MAAM,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,CAAA;QAC3C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,wFAAwF;YACxF,mFAAmF;YACnF,QAAQ,CAAC,IAAI,CAAC,UAAU,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;YACtC,MAAM,MAAM,CAAC,KAAK,CAAC,cAAc,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QAC5D,CAAC;IACH,CAAC;IAED,6EAA6E;IAC7E,sEAAsE;IACtE,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAA;IACjD,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,MAAM,CAAA;IACtC,KAAK,CAAC,KAAK,EAAE,CAAA;IACb,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;QACjB,QAAQ,CAAC,IAAI,CACX,GAAG,QAAQ,oCAAoC,YAAY,mFAAmF,CAC/I,CAAA;QACD,MAAM,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAA;IAC9D,CAAC;IAED,OAAO;QACL,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,MAAM,EAAE;QAC3E,UAAU,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,EAAE,gBAAgB,EAAE;QACrE,MAAM;QACN,KAAK;QACL,SAAS,EAAE,QAAQ;QACnB,QAAQ;KACT,CAAA;AACH,CAAC;AAED,SAAS,UAAU,CAAC,QAAgB,EAAE,IAAY;IAChD,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAA,CAAC,oCAAoC;IACtE,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,IAAI,QAAQ,CAAC,CAAA;IACvD,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,CAAA;AAC5B,CAAC;AAED,mFAAmF;AACnF,MAAM,UAAU,eAAe,CAAC,WAAW,GAAG,CAAC,EAAE,MAAM,GAAG,GAAG;IAC3D,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC,CAAA;AACvE,CAAC;AAQD;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,QAAgB,EAAE,OAAuB,EAAE;IACvE,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAA;IACxC,MAAM,OAAO,GAAG,eAAe,EAAE,CAAA;IACjC,OAAO,IAAI,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,EAAE,CAAC;QACrC,IAAI,OAAO,GAAG,CAAC,CAAA;QACf,OAAO,IAAI,EAAE,CAAC;YACZ,IAAI,CAAC;gBACH,MAAM,iBAAiB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;gBACvC,MAAK;YACP,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,CAAC,OAAO,EAAE,CAAC,YAAY,EAAE,GAAG,CAAC,CAAA;gBACjC,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM;oBAAE,MAAK;gBACpC,sGAAsG;gBACtG,MAAM,KAAK,CAAC,OAAO,CAAC,OAAO,CAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;gBAC3C,OAAO,IAAI,CAAC,CAAA;YACd,CAAC;QACH,CAAC;QACD,MAAM,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;IACpC,CAAC;AACH,CAAC;AAED,SAAS,KAAK,CAAC,EAAU,EAAE,MAAoB;IAC7C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,CAAC,GAAG,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAA;QACjC,MAAM,EAAE,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE;YACrC,YAAY,CAAC,CAAC,CAAC,CAAA;YACf,OAAO,EAAE,CAAA;QACX,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synthesis.d.ts","sourceRoot":"","sources":["../../src/loops/synthesis.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,eAAe,EAGrB,MAAM,mCAAmC,CAAA;AAS1C,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,YAAY,EAAE,EAC1B,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAO,GACvF,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"synthesis.d.ts","sourceRoot":"","sources":["../../src/loops/synthesis.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,eAAe,EAGrB,MAAM,mCAAmC,CAAA;AAS1C,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,QAAQ,EAAE,MAAM,CAAA;CACjB;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,YAAY,EAAE,EAC1B,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAO,GACvF,eAAe,EAAE,CA+CnB;AAED,MAAM,WAAW,WAAY,SAAQ,eAAe;IAClD,MAAM,EAAE,OAAO,CAAA;IACf,WAAW,EAAE,MAAM,CAAA;CACpB;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,KAAK,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,GAChD,WAAW,CAmBb"}
|
package/dist/loops/synthesis.js
CHANGED
|
@@ -14,6 +14,8 @@ export function suggestThemesOnce(seedPath, highlights, opts = {}) {
|
|
|
14
14
|
...(opts.threshold !== undefined ? { threshold: opts.threshold } : {}),
|
|
15
15
|
...(opts.minSize !== undefined ? { minSize: opts.minSize } : {}),
|
|
16
16
|
}).slice(0, MAX_SUGGESTIONS);
|
|
17
|
+
const allIds = highlights.map((h) => h.id);
|
|
18
|
+
const threshold = opts.threshold ?? 0.75;
|
|
17
19
|
const events = openSeedEvents(seedPath);
|
|
18
20
|
const out = [];
|
|
19
21
|
try {
|
|
@@ -24,11 +26,24 @@ export function suggestThemesOnce(seedPath, highlights, opts = {}) {
|
|
|
24
26
|
cohesion: cluster.cohesion,
|
|
25
27
|
status: 'draft',
|
|
26
28
|
};
|
|
29
|
+
// Capture the deterministic inputs so this code draft is rerun-able: the
|
|
30
|
+
// clustering is a pure function of the highlight set + params, so recording
|
|
31
|
+
// them lets `compost rerun` re-derive and diff (exactly, if embeddings are
|
|
32
|
+
// unchanged). One bundle per cluster — context carries this cluster's members.
|
|
27
33
|
const event = emitAgentCreate(events, {
|
|
28
34
|
artifactKind: 'code',
|
|
29
35
|
initialState,
|
|
30
36
|
agentName: SCANNER,
|
|
31
37
|
agentVersion: VERSION,
|
|
38
|
+
inputs: {
|
|
39
|
+
model: opts.model ?? `${SCANNER}@${VERSION}`,
|
|
40
|
+
params: {
|
|
41
|
+
threshold,
|
|
42
|
+
...(opts.minSize !== undefined ? { minSize: opts.minSize } : {}),
|
|
43
|
+
},
|
|
44
|
+
prompt: `cosine-cluster ${allIds.length} highlights; emit cohesive code clusters`,
|
|
45
|
+
context: { highlight_ids: allIds, members: cluster.members },
|
|
46
|
+
},
|
|
32
47
|
});
|
|
33
48
|
out.push({
|
|
34
49
|
artifact_id: event.artifact_id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"synthesis.js","sourceRoot":"","sources":["../../src/loops/synthesis.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,eAAe,EACf,mBAAmB,GACpB,MAAM,mCAAmC,CAAA;AAE1C,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAE9E,MAAM,OAAO,GAAG,oBAAoB,CAAA;AACpC,MAAM,KAAK,GAAG,kBAAkB,CAAA;AAChC,MAAM,OAAO,GAAG,OAAO,CAAA;AACvB,MAAM,eAAe,GAAG,EAAE,CAAA;AAQ1B;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAC/B,QAAgB,EAChB,UAA0B,EAC1B,OAAsF,EAAE;IAExF,MAAM,QAAQ,GAAG,mBAAmB,CAAC,UAAU,EAAE;QAC/C,GAAG,CAAC,IAAI,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACtE,GAAG,CAAC,IAAI,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACjE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,CAAC,CAAA;IAE5B,MAAM,MAAM,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAA;IACvC,MAAM,GAAG,GAAsB,EAAE,CAAA;IACjC,IAAI,CAAC;QACH,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,MAAM,YAAY,GAAG;gBACnB,IAAI,EAAE,MAAM;gBACZ,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,MAAM,EAAE,OAAO;aAChB,CAAA;YACD,MAAM,KAAK,GAAG,eAAe,CAAC,MAAM,EAAE;gBACpC,YAAY,EAAE,MAAM;gBACpB,YAAY;gBACZ,SAAS,EAAE,OAAO;gBAClB,YAAY,EAAE,OAAO;
|
|
1
|
+
{"version":3,"file":"synthesis.js","sourceRoot":"","sources":["../../src/loops/synthesis.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transcribe_worker.d.ts","sourceRoot":"","sources":["../../src/loops/transcribe_worker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"transcribe_worker.d.ts","sourceRoot":"","sources":["../../src/loops/transcribe_worker.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAK5D,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,KAAK,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CACjG;AAED,MAAM,WAAW,UAAU;IACzB,MAAM,CAAC,EAAE,iBAAiB,CAAA;CAC3B;AAED;;;;;;GAMG;AACH,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,UAAe,GACpB,OAAO,CAAC,gBAAgB,CAAC,CA8D3B"}
|
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
import { existsSync } from 'node:fs';
|
|
2
|
-
import { dirname } from 'node:path';
|
|
3
2
|
import { emitAgentCreate, openSeedEvents } from '../lib/events.js';
|
|
4
|
-
import { JobQueue, stateDbPath } from '../lib/queue.js';
|
|
3
|
+
import { JobQueue, MAX_ATTEMPTS, resolveJobSource, stateDbPath } from '../lib/queue.js';
|
|
5
4
|
import { writeTranscriptMd } from '../render/transcript_md.js';
|
|
6
5
|
import { TranscriberClient } from '../transcriber_client.js';
|
|
7
6
|
const AGENT_NAME = 'transcribe-worker';
|
|
8
7
|
const AGENT_VERSION = '0.1.0';
|
|
9
|
-
const MAX_ATTEMPTS = 3;
|
|
10
8
|
/**
|
|
11
9
|
* Drain all queued `transcribe` jobs (concurrency 1 — the Python service is the
|
|
12
10
|
* bottleneck). For each: call the service, render transcript.md, and complete.
|
|
@@ -28,7 +26,7 @@ export async function runTranscribeWorkerOnce(seedPath, deps = {}) {
|
|
|
28
26
|
const sessionId = String(job.payload.session_id ?? 'S?');
|
|
29
27
|
try {
|
|
30
28
|
const language = typeof job.payload.language === 'string' ? job.payload.language : undefined;
|
|
31
|
-
const resp = await client.transcribe(job.source_path, sessionId, seedPath, language);
|
|
29
|
+
const resp = await client.transcribe(resolveJobSource(seedPath, job.source_path), sessionId, seedPath, language);
|
|
32
30
|
if (resp.status === 'failed_transcription') {
|
|
33
31
|
queue.fail(job.id, 'service reported failed_transcription', MAX_ATTEMPTS);
|
|
34
32
|
out.results.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transcribe_worker.js","sourceRoot":"","sources":["../../src/loops/transcribe_worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"transcribe_worker.js","sourceRoot":"","sources":["../../src/loops/transcribe_worker.ts"],"names":[],"mappings":"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"}
|
package/dist/output.d.ts
CHANGED
|
@@ -2,7 +2,19 @@ import type { Command } from 'commander';
|
|
|
2
2
|
export interface OutputOptions {
|
|
3
3
|
human: boolean;
|
|
4
4
|
}
|
|
5
|
+
/**
|
|
6
|
+
* Resolve the output mode (#173). Explicit flags win: `--json` → machine,
|
|
7
|
+
* `--human` → readable. With neither, auto-detect: a TTY (a researcher at a
|
|
8
|
+
* terminal) gets human output; a pipe/redirect/MCP spawn (no TTY) gets JSON, so
|
|
9
|
+
* the agent path is unaffected.
|
|
10
|
+
*/
|
|
5
11
|
export declare function getOutputOpts(cmd: Command): OutputOptions;
|
|
6
|
-
|
|
12
|
+
/**
|
|
13
|
+
* Emit a result. In human mode, if a `render` function is provided it prints a
|
|
14
|
+
* readable summary; otherwise (and for any command without a renderer) it
|
|
15
|
+
* pretty-prints the JSON. Machine mode always prints compact JSON — unchanged,
|
|
16
|
+
* so the MCP/agent path is byte-for-byte identical.
|
|
17
|
+
*/
|
|
18
|
+
export declare function emit(data: unknown, opts: OutputOptions, render?: (data: never) => string): void;
|
|
7
19
|
export declare function emitError(err: unknown, opts: OutputOptions): never;
|
|
8
20
|
//# sourceMappingURL=output.d.ts.map
|
package/dist/output.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../src/output.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAIxC,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,OAAO,CAAA;CACf;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,aAAa,
|
|
1
|
+
{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../src/output.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAIxC,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,OAAO,CAAA;CACf;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,GAAG,aAAa,CAOzD;AAED;;;;;GAKG;AACH,wBAAgB,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,MAAM,GAAG,IAAI,CAO/F;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,GAAG,KAAK,CAalE"}
|
package/dist/output.js
CHANGED
|
@@ -1,12 +1,32 @@
|
|
|
1
1
|
import { isCompostError } from './errors.js';
|
|
2
|
+
/**
|
|
3
|
+
* Resolve the output mode (#173). Explicit flags win: `--json` → machine,
|
|
4
|
+
* `--human` → readable. With neither, auto-detect: a TTY (a researcher at a
|
|
5
|
+
* terminal) gets human output; a pipe/redirect/MCP spawn (no TTY) gets JSON, so
|
|
6
|
+
* the agent path is unaffected.
|
|
7
|
+
*/
|
|
2
8
|
export function getOutputOpts(cmd) {
|
|
3
9
|
let root = cmd;
|
|
4
10
|
while (root.parent)
|
|
5
11
|
root = root.parent;
|
|
6
12
|
const opts = root.opts();
|
|
7
|
-
|
|
13
|
+
if (opts.json === true)
|
|
14
|
+
return { human: false };
|
|
15
|
+
if (opts.human === true)
|
|
16
|
+
return { human: true };
|
|
17
|
+
return { human: process.stdout.isTTY === true };
|
|
8
18
|
}
|
|
9
|
-
|
|
19
|
+
/**
|
|
20
|
+
* Emit a result. In human mode, if a `render` function is provided it prints a
|
|
21
|
+
* readable summary; otherwise (and for any command without a renderer) it
|
|
22
|
+
* pretty-prints the JSON. Machine mode always prints compact JSON — unchanged,
|
|
23
|
+
* so the MCP/agent path is byte-for-byte identical.
|
|
24
|
+
*/
|
|
25
|
+
export function emit(data, opts, render) {
|
|
26
|
+
if (opts.human && render !== undefined) {
|
|
27
|
+
process.stdout.write(`${render(data)}\n`);
|
|
28
|
+
return;
|
|
29
|
+
}
|
|
10
30
|
const text = opts.human ? JSON.stringify(data, null, 2) : JSON.stringify(data);
|
|
11
31
|
process.stdout.write(`${text}\n`);
|
|
12
32
|
}
|
package/dist/output.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.js","sourceRoot":"","sources":["../src/output.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAM5C,MAAM,UAAU,aAAa,CAAC,GAAY;IACxC,IAAI,IAAI,GAAY,GAAG,CAAA;IACvB,OAAO,IAAI,CAAC,MAAM;QAAE,IAAI,GAAG,IAAI,CAAC,MAAM,CAAA;IACtC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../src/output.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AAM5C;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAAC,GAAY;IACxC,IAAI,IAAI,GAAY,GAAG,CAAA;IACvB,OAAO,IAAI,CAAC,MAAM;QAAE,IAAI,GAAG,IAAI,CAAC,MAAM,CAAA;IACtC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,EAAyC,CAAA;IAC/D,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI;QAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IAC/C,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI;QAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;IAC/C,OAAO,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,KAAK,IAAI,EAAE,CAAA;AACjD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,IAAI,CAAC,IAAa,EAAE,IAAmB,EAAE,MAAgC;IACvF,IAAI,IAAI,CAAC,KAAK,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACvC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,IAAa,CAAC,IAAI,CAAC,CAAA;QAClD,OAAM;IACR,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;IAC9E,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,IAAI,CAAC,CAAA;AACnC,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,GAAY,EAAE,IAAmB;IACzD,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,CAAA;IACnC,MAAM,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAA;IAC5C,MAAM,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;IAEhE,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,OAAO,IAAI,CAAC,CAAA;QAC3C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,CAAA;IACzC,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,CAAA;IAC3E,CAAC;IAED,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACjB,CAAC"}
|