@they-juanreina/compost-cli 0.1.3 → 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/dist/commands/agreement.d.ts.map +1 -1
- package/dist/commands/agreement.js +2 -2
- package/dist/commands/agreement.js.map +1 -1
- package/dist/commands/backup.d.ts +3 -0
- package/dist/commands/backup.d.ts.map +1 -0
- package/dist/commands/backup.js +31 -0
- package/dist/commands/backup.js.map +1 -0
- package/dist/commands/chat.d.ts.map +1 -1
- package/dist/commands/chat.js +3 -2
- package/dist/commands/chat.js.map +1 -1
- package/dist/commands/export.d.ts.map +1 -1
- package/dist/commands/export.js +2 -2
- package/dist/commands/export.js.map +1 -1
- package/dist/commands/import.d.ts.map +1 -1
- package/dist/commands/import.js +5 -0
- package/dist/commands/import.js.map +1 -1
- package/dist/commands/ingest.d.ts.map +1 -1
- package/dist/commands/ingest.js +1 -0
- package/dist/commands/ingest.js.map +1 -1
- 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/reindex.d.ts.map +1 -1
- package/dist/commands/reindex.js +18 -8
- package/dist/commands/reindex.js.map +1 -1
- package/dist/commands/search.d.ts.map +1 -1
- package/dist/commands/search.js +10 -0
- package/dist/commands/search.js.map +1 -1
- package/dist/commands/secrets.d.ts.map +1 -1
- package/dist/commands/secrets.js +13 -11
- package/dist/commands/secrets.js.map +1 -1
- package/dist/commands/setup.d.ts.map +1 -1
- package/dist/commands/setup.js +5 -1
- package/dist/commands/setup.js.map +1 -1
- package/dist/commands/setupItem.d.ts +26 -0
- package/dist/commands/setupItem.d.ts.map +1 -0
- package/dist/commands/setupItem.js +145 -0
- package/dist/commands/setupItem.js.map +1 -0
- package/dist/commands/transcribe.d.ts.map +1 -1
- package/dist/commands/transcribe.js +25 -8
- package/dist/commands/transcribe.js.map +1 -1
- package/dist/commands/watch.d.ts.map +1 -1
- package/dist/commands/watch.js +53 -6
- package/dist/commands/watch.js.map +1 -1
- package/dist/errors.d.ts +5 -1
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +6 -0
- package/dist/errors.js.map +1 -1
- package/dist/exporters/pdf.d.ts.map +1 -1
- package/dist/exporters/pdf.js +2 -1
- package/dist/exporters/pdf.js.map +1 -1
- package/dist/legacy_client.d.ts.map +1 -1
- package/dist/legacy_client.js +2 -1
- package/dist/legacy_client.js.map +1 -1
- package/dist/lib/artifacts.d.ts +3 -1
- package/dist/lib/artifacts.d.ts.map +1 -1
- package/dist/lib/artifacts.js +15 -20
- package/dist/lib/artifacts.js.map +1 -1
- package/dist/lib/backup.d.ts +37 -0
- package/dist/lib/backup.d.ts.map +1 -0
- package/dist/lib/backup.js +57 -0
- package/dist/lib/backup.js.map +1 -0
- package/dist/lib/childEnv.d.ts +13 -0
- package/dist/lib/childEnv.d.ts.map +1 -0
- package/dist/lib/childEnv.js +45 -0
- package/dist/lib/childEnv.js.map +1 -0
- package/dist/lib/events.d.ts +10 -0
- package/dist/lib/events.d.ts.map +1 -1
- package/dist/lib/events.js +20 -1
- package/dist/lib/events.js.map +1 -1
- package/dist/lib/journal.d.ts +0 -4
- package/dist/lib/journal.d.ts.map +1 -1
- package/dist/lib/journal.js +8 -18
- package/dist/lib/journal.js.map +1 -1
- package/dist/lib/legacyNative.d.ts +1 -8
- package/dist/lib/legacyNative.d.ts.map +1 -1
- package/dist/lib/legacyNative.js +10 -23
- package/dist/lib/legacyNative.js.map +1 -1
- package/dist/lib/migrate.d.ts.map +1 -1
- package/dist/lib/migrate.js +9 -2
- package/dist/lib/migrate.js.map +1 -1
- package/dist/lib/nativeRuntime.d.ts +31 -0
- package/dist/lib/nativeRuntime.d.ts.map +1 -1
- package/dist/lib/nativeRuntime.js +38 -0
- package/dist/lib/nativeRuntime.js.map +1 -1
- package/dist/lib/pathSafe.d.ts +8 -0
- package/dist/lib/pathSafe.d.ts.map +1 -0
- package/dist/lib/pathSafe.js +12 -0
- package/dist/lib/pathSafe.js.map +1 -0
- package/dist/lib/provisionNative.d.ts.map +1 -1
- package/dist/lib/provisionNative.js +6 -2
- package/dist/lib/provisionNative.js.map +1 -1
- package/dist/lib/reads.d.ts.map +1 -1
- package/dist/lib/reads.js +2 -2
- package/dist/lib/reads.js.map +1 -1
- package/dist/lib/redact.d.ts +7 -0
- package/dist/lib/redact.d.ts.map +1 -0
- package/dist/lib/redact.js +45 -0
- package/dist/lib/redact.js.map +1 -0
- package/dist/lib/rerun.d.ts.map +1 -1
- package/dist/lib/rerun.js +3 -9
- package/dist/lib/rerun.js.map +1 -1
- package/dist/lib/retrieve.d.ts.map +1 -1
- package/dist/lib/retrieve.js +2 -1
- package/dist/lib/retrieve.js.map +1 -1
- package/dist/lib/saturate.js +3 -3
- package/dist/lib/saturate.js.map +1 -1
- package/dist/lib/secrets.d.ts.map +1 -1
- package/dist/lib/secrets.js +84 -77
- package/dist/lib/secrets.js.map +1 -1
- package/dist/lib/seedResolve.d.ts +5 -0
- package/dist/lib/seedResolve.d.ts.map +1 -1
- package/dist/lib/seedResolve.js +12 -3
- package/dist/lib/seedResolve.js.map +1 -1
- package/dist/lib/session.d.ts.map +1 -1
- package/dist/lib/session.js +6 -4
- package/dist/lib/session.js.map +1 -1
- package/dist/lib/sessionId.d.ts +9 -0
- package/dist/lib/sessionId.d.ts.map +1 -0
- package/dist/lib/sessionId.js +37 -0
- package/dist/lib/sessionId.js.map +1 -0
- package/dist/lib/setup.d.ts +4 -0
- package/dist/lib/setup.d.ts.map +1 -1
- package/dist/lib/setup.js +28 -23
- package/dist/lib/setup.js.map +1 -1
- package/dist/lib/setupItem.d.ts +99 -0
- package/dist/lib/setupItem.d.ts.map +1 -0
- package/dist/lib/setupItem.js +262 -0
- package/dist/lib/setupItem.js.map +1 -0
- package/dist/lib/setupWizard.d.ts +2 -0
- package/dist/lib/setupWizard.d.ts.map +1 -1
- package/dist/lib/setupWizard.js +144 -20
- package/dist/lib/setupWizard.js.map +1 -1
- package/dist/lib/snap.d.ts.map +1 -1
- package/dist/lib/snap.js +5 -0
- package/dist/lib/snap.js.map +1 -1
- package/dist/lib/stdin.d.ts +5 -0
- package/dist/lib/stdin.d.ts.map +1 -0
- package/dist/lib/stdin.js +12 -0
- package/dist/lib/stdin.js.map +1 -0
- package/dist/lib/transcribeNative.d.ts +4 -9
- package/dist/lib/transcribeNative.d.ts.map +1 -1
- package/dist/lib/transcribeNative.js +11 -26
- package/dist/lib/transcribeNative.js.map +1 -1
- package/dist/lib/validate.d.ts.map +1 -1
- package/dist/lib/validate.js +2 -1
- package/dist/lib/validate.js.map +1 -1
- package/dist/lib/version.d.ts.map +1 -1
- package/dist/lib/version.js +2 -10
- package/dist/lib/version.js.map +1 -1
- package/dist/llm/adapter.d.ts +5 -0
- package/dist/llm/adapter.d.ts.map +1 -1
- package/dist/llm/adapter.js +25 -8
- package/dist/llm/adapter.js.map +1 -1
- package/dist/llm/http.d.ts +22 -1
- package/dist/llm/http.d.ts.map +1 -1
- package/dist/llm/http.js +52 -30
- package/dist/llm/http.js.map +1 -1
- package/dist/llm/providers/anthropic.d.ts.map +1 -1
- package/dist/llm/providers/anthropic.js +6 -9
- package/dist/llm/providers/anthropic.js.map +1 -1
- package/dist/llm/providers/ollama.d.ts.map +1 -1
- package/dist/llm/providers/ollama.js +2 -7
- package/dist/llm/providers/ollama.js.map +1 -1
- package/dist/llm/providers/openai_compatible.d.ts.map +1 -1
- package/dist/llm/providers/openai_compatible.js +2 -7
- package/dist/llm/providers/openai_compatible.js.map +1 -1
- package/dist/logging.d.ts.map +1 -1
- package/dist/logging.js +3 -1
- package/dist/logging.js.map +1 -1
- package/dist/loops/embed_worker.d.ts +3 -0
- package/dist/loops/embed_worker.d.ts.map +1 -1
- package/dist/loops/embed_worker.js +11 -4
- package/dist/loops/embed_worker.js.map +1 -1
- package/dist/loops/legacy_worker.d.ts.map +1 -1
- package/dist/loops/legacy_worker.js +12 -3
- package/dist/loops/legacy_worker.js.map +1 -1
- package/dist/loops/supervisor.d.ts +4 -0
- package/dist/loops/supervisor.d.ts.map +1 -1
- package/dist/loops/supervisor.js +6 -2
- package/dist/loops/supervisor.js.map +1 -1
- package/dist/loops/transcribe_worker.d.ts +3 -0
- package/dist/loops/transcribe_worker.d.ts.map +1 -1
- package/dist/loops/transcribe_worker.js +13 -4
- package/dist/loops/transcribe_worker.js.map +1 -1
- package/dist/output.d.ts.map +1 -1
- package/dist/output.js +5 -4
- package/dist/output.js.map +1 -1
- package/dist/render/glyphs.d.ts +30 -0
- package/dist/render/glyphs.d.ts.map +1 -0
- package/dist/render/glyphs.js +38 -0
- package/dist/render/glyphs.js.map +1 -0
- package/dist/render/human.d.ts +2 -0
- package/dist/render/human.d.ts.map +1 -1
- package/dist/render/human.js +12 -4
- package/dist/render/human.js.map +1 -1
- package/dist/router.d.ts.map +1 -1
- package/dist/router.js +16 -3
- package/dist/router.js.map +1 -1
- package/dist/transcriber_client.d.ts.map +1 -1
- package/dist/transcriber_client.js +2 -1
- package/dist/transcriber_client.js.map +1 -1
- package/package.json +4 -4
- package/templates/AGENTS.md +1 -1
- package/transcriber/app/transcribe_cli.py +15 -1
package/dist/lib/setupWizard.js
CHANGED
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
import { existsSync } from 'node:fs';
|
|
2
2
|
import { join } from 'node:path';
|
|
3
|
-
import {
|
|
3
|
+
import { errMessage } from '../errors.js';
|
|
4
|
+
import { fetchWithTimeout, resolveFetch } from '../llm/http.js';
|
|
5
|
+
import { glyphs, statusGlyph } from '../render/glyphs.js';
|
|
4
6
|
import { loadConfig, saveConfig, setConfigValue } from './config.js';
|
|
5
7
|
import { diagnoseNativeRuntime, isAppleSilicon } from './nativeRuntime.js';
|
|
6
8
|
import { provisionNativeVenv } from './provisionNative.js';
|
|
7
9
|
import { setSecret } from './secrets.js';
|
|
8
|
-
import { runSetup } from './setup.js';
|
|
10
|
+
import { LICENSE_PROBE_TIMEOUT_MS, runSetup } from './setup.js';
|
|
11
|
+
import { actionsFor, runItem } from './setupItem.js';
|
|
9
12
|
import { saveUserConfig } from './userConfig.js';
|
|
10
13
|
/** Per-task routes the wizard writes for each chat-model choice. The local
|
|
11
14
|
* default matches the seed template's quick_chat model; the cloud routes keep
|
|
@@ -17,16 +20,36 @@ const PYANNOTE_GATED_REPOS = ['pyannote/speaker-diarization-3.1', 'pyannote/segm
|
|
|
17
20
|
function checkById(report, id) {
|
|
18
21
|
return report.checks.find((c) => c.id === id);
|
|
19
22
|
}
|
|
23
|
+
/** True for embedding models — not usable for chat, so they're filtered out of
|
|
24
|
+
* the chat-model picker (compost pulls bge-m3 for search; it would be a
|
|
25
|
+
* confusing pick here). */
|
|
26
|
+
function isEmbeddingModel(name) {
|
|
27
|
+
return /(^bge|embed)/i.test(name);
|
|
28
|
+
}
|
|
29
|
+
/** Names of the chat-capable models already installed in Ollama, best-effort.
|
|
30
|
+
* Returns [] on any error (offline, Ollama down) so the wizard falls back to
|
|
31
|
+
* offering a pull — never throws. Mirrors the /api/tags probe in setup.ts. */
|
|
32
|
+
async function listInstalledChatModels(fetchImpl, ollamaUrl) {
|
|
33
|
+
try {
|
|
34
|
+
const res = await fetchImpl(`${ollamaUrl}/api/tags`, { method: 'GET' });
|
|
35
|
+
if (!res.ok)
|
|
36
|
+
return [];
|
|
37
|
+
const json = (await res.json());
|
|
38
|
+
return (json.models ?? [])
|
|
39
|
+
.map((m) => m.name ?? '')
|
|
40
|
+
.filter((n) => n !== '' && !isEmbeddingModel(n));
|
|
41
|
+
}
|
|
42
|
+
catch {
|
|
43
|
+
return [];
|
|
44
|
+
}
|
|
45
|
+
}
|
|
20
46
|
function notOk(report, id) {
|
|
21
47
|
const c = checkById(report, id);
|
|
22
48
|
return c !== undefined && c.status !== 'ok';
|
|
23
49
|
}
|
|
24
|
-
function statusGlyph(c) {
|
|
25
|
-
return c.status === 'ok' ? '✓' : c.status === 'warn' ? '!' : '✗';
|
|
26
|
-
}
|
|
27
50
|
function printReport(io, report) {
|
|
28
51
|
for (const c of report.checks) {
|
|
29
|
-
io.say(` ${statusGlyph(c)} ${c.label} — ${c.detail}`);
|
|
52
|
+
io.say(` ${statusGlyph(c.status)} ${c.label} — ${c.detail}`);
|
|
30
53
|
}
|
|
31
54
|
}
|
|
32
55
|
/**
|
|
@@ -47,6 +70,7 @@ export async function runSetupWizard(deps) {
|
|
|
47
70
|
const storeSecret = deps.storeSecret ?? setSecret;
|
|
48
71
|
const saveDefaults = deps.saveDefaults ?? saveUserConfig;
|
|
49
72
|
const fetchImpl = resolveFetch(deps.fetchImpl);
|
|
73
|
+
const ollamaUrl = (deps.ollamaUrl ?? 'http://localhost:11434').replace(/\/$/, '');
|
|
50
74
|
const actions = [];
|
|
51
75
|
io.say('compost setup — guided');
|
|
52
76
|
io.say(`platform: ${process.platform}/${process.arch}${apple ? ' (native transcription)' : ' (Docker transcription fallback)'}`);
|
|
@@ -99,7 +123,7 @@ export async function runSetupWizard(deps) {
|
|
|
99
123
|
actions.push(`native engine: ${result.status}`);
|
|
100
124
|
}
|
|
101
125
|
catch (err) {
|
|
102
|
-
io.say(` provisioning failed: ${err
|
|
126
|
+
io.say(` provisioning failed: ${errMessage(err)}`);
|
|
103
127
|
actions.push('native provisioning failed');
|
|
104
128
|
}
|
|
105
129
|
}
|
|
@@ -141,33 +165,52 @@ export async function runSetupWizard(deps) {
|
|
|
141
165
|
for (const repo of PYANNOTE_GATED_REPOS) {
|
|
142
166
|
let accepted = false;
|
|
143
167
|
try {
|
|
144
|
-
const res = await fetchImpl
|
|
145
|
-
method: 'GET',
|
|
146
|
-
headers: { Authorization: `Bearer ${token}` },
|
|
147
|
-
});
|
|
168
|
+
const res = await fetchWithTimeout(fetchImpl, `https://huggingface.co/${repo}/resolve/main/config.yaml`, { method: 'GET', headers: { Authorization: `Bearer ${token}` } }, LICENSE_PROBE_TIMEOUT_MS);
|
|
148
169
|
accepted = res.ok;
|
|
149
170
|
}
|
|
150
171
|
catch {
|
|
151
172
|
accepted = false;
|
|
152
173
|
}
|
|
174
|
+
const lg = glyphs();
|
|
153
175
|
io.say(accepted
|
|
154
|
-
? `
|
|
155
|
-
: `
|
|
176
|
+
? ` ${lg.ok} license accepted: ${repo}`
|
|
177
|
+
: ` ${lg.warn} license NOT accepted yet: https://huggingface.co/${repo}`);
|
|
156
178
|
}
|
|
157
179
|
}
|
|
158
180
|
}
|
|
159
181
|
// ── Chat model: how should `compost chat` answer on this machine? ────────
|
|
160
182
|
io.say('');
|
|
161
183
|
io.say('`compost chat` answers questions from your transcripts. Pick how it should run:');
|
|
162
|
-
io.say(
|
|
184
|
+
io.say(' [1] local — run offline via Ollama (reuse a model you have, or pull one)');
|
|
163
185
|
io.say(' [2] cloud — use an Anthropic API key (best quality; sends excerpts to the API)');
|
|
164
186
|
io.say(' [3] skip for now');
|
|
165
187
|
const choice = (await io.ask('Choice', '1')).trim();
|
|
166
188
|
let routes = null;
|
|
167
189
|
if (choice === '1') {
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
190
|
+
// Offer the chat models already installed first — no reason to force a
|
|
191
|
+
// multi-GB pull when a capable model is sitting in Ollama's store.
|
|
192
|
+
const installed = await listInstalledChatModels(fetchImpl, ollamaUrl);
|
|
193
|
+
let model = '';
|
|
194
|
+
let needsPull = true;
|
|
195
|
+
if (installed.length > 0) {
|
|
196
|
+
io.say(' Use a model you already have (no download), or pull a new one:');
|
|
197
|
+
for (const [i, m] of installed.entries())
|
|
198
|
+
io.say(` [${i + 1}] ${m} (installed)`);
|
|
199
|
+
io.say(` [${installed.length + 1}] pull a different model (default ${LOCAL_CHAT_MODEL})`);
|
|
200
|
+
const pick = Number.parseInt((await io.ask('Model number', '1')).trim(), 10) - 1;
|
|
201
|
+
if (pick >= 0 && pick < installed.length) {
|
|
202
|
+
model = installed[pick];
|
|
203
|
+
needsPull = false;
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
if (needsPull) {
|
|
207
|
+
model = (await io.ask('Model to pull', LOCAL_CHAT_MODEL)).trim() || LOCAL_CHAT_MODEL;
|
|
208
|
+
if (!run('ollama', ['pull', model]).ok) {
|
|
209
|
+
io.say(' pull failed — is Ollama running? Rerun `compost setup` to retry.');
|
|
210
|
+
model = '';
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
if (model !== '') {
|
|
171
214
|
routes = {
|
|
172
215
|
quick_chat: `ollama:${model}`,
|
|
173
216
|
verification: `ollama:${model}`,
|
|
@@ -176,9 +219,6 @@ export async function runSetupWizard(deps) {
|
|
|
176
219
|
actions.push(`chat: local via ollama:${model}`);
|
|
177
220
|
io.say(' (cloud-quality synthesis can be added any time: rerun `compost setup` and pick cloud.)');
|
|
178
221
|
}
|
|
179
|
-
else {
|
|
180
|
-
io.say(` pull failed — is Ollama running? Rerun \`compost setup\` to retry.`);
|
|
181
|
-
}
|
|
182
222
|
}
|
|
183
223
|
else if (choice === '2') {
|
|
184
224
|
const key = (await io.askHidden('Anthropic API key (hidden): ')).trim();
|
|
@@ -212,6 +252,15 @@ export async function runSetupWizard(deps) {
|
|
|
212
252
|
report = await check({ cwd, env });
|
|
213
253
|
printReport(io, report);
|
|
214
254
|
io.say('');
|
|
255
|
+
// ── Maintain one item (change/renew/forget a token, re-pull a model) ──────
|
|
256
|
+
// Only once the install is otherwise healthy, so a first-run-with-gaps flow
|
|
257
|
+
// is unchanged. This is the path a *returning* user needs — the gap-driven
|
|
258
|
+
// walk above only surfaces an item when it is broken, never to change a set
|
|
259
|
+
// one. Driven by item number (blank = skip), so it wraps the same `runItem`
|
|
260
|
+
// primitive the `compost setup item` CLI and the skill use.
|
|
261
|
+
if (report.ready) {
|
|
262
|
+
await maintainItem({ io, report, run, fetchImpl, storeSecret, actions });
|
|
263
|
+
}
|
|
215
264
|
io.say(report.ready
|
|
216
265
|
? 'Ready. Next steps:'
|
|
217
266
|
: 'Some checks still need attention (see above). Next steps:');
|
|
@@ -220,4 +269,79 @@ export async function runSetupWizard(deps) {
|
|
|
220
269
|
io.say(' compost watch --once # process it');
|
|
221
270
|
return { report, actions };
|
|
222
271
|
}
|
|
272
|
+
/**
|
|
273
|
+
* Interactive "fix one item" menu — the path a *returning* user needs once the
|
|
274
|
+
* install is healthy (the gap-driven walk above only ever surfaces an item when
|
|
275
|
+
* it is broken, never to change a set one). Lists every check that carries
|
|
276
|
+
* lifecycle actions, runs the chosen one through the shared `runItem` primitive
|
|
277
|
+
* (same code path as the `compost setup item` CLI and the skill), and surfaces
|
|
278
|
+
* the remote half — the part compost can't do. Selection is by number; a blank
|
|
279
|
+
* entry skips, so an exhausted/scripted IO is a no-op. One item per run.
|
|
280
|
+
*/
|
|
281
|
+
async function maintainItem(args) {
|
|
282
|
+
const { io, report } = args;
|
|
283
|
+
const items = report.checks
|
|
284
|
+
.map((c) => ({ id: c.id, actions: actionsFor(c.id) }))
|
|
285
|
+
.filter((it) => it.actions.length > 0);
|
|
286
|
+
if (items.length === 0)
|
|
287
|
+
return;
|
|
288
|
+
io.say('Maintain a specific item? (e.g. change/renew/forget the HuggingFace token)');
|
|
289
|
+
for (const [i, it] of items.entries()) {
|
|
290
|
+
io.say(` [${i + 1}] ${it.id} (${it.actions.map((a) => a.id).join(' / ')})`);
|
|
291
|
+
}
|
|
292
|
+
const pick = (await io.ask('Item number (blank to finish)', '')).trim();
|
|
293
|
+
if (pick === '')
|
|
294
|
+
return;
|
|
295
|
+
const item = items[Number.parseInt(pick, 10) - 1];
|
|
296
|
+
if (!item) {
|
|
297
|
+
io.say(` no item "${pick}".`);
|
|
298
|
+
return;
|
|
299
|
+
}
|
|
300
|
+
for (const [i, a] of item.actions.entries()) {
|
|
301
|
+
io.say(` [${i + 1}] ${a.id} — ${a.label}${a.url ? ` (${a.url})` : ''}`);
|
|
302
|
+
}
|
|
303
|
+
const aPick = (await io.ask('Action number', '1')).trim();
|
|
304
|
+
const action = item.actions[Number.parseInt(aPick, 10) - 1];
|
|
305
|
+
if (!action) {
|
|
306
|
+
io.say(` no action "${aPick}".`);
|
|
307
|
+
return;
|
|
308
|
+
}
|
|
309
|
+
const deps = {
|
|
310
|
+
run: args.run,
|
|
311
|
+
fetchImpl: args.fetchImpl,
|
|
312
|
+
storeSecret: args.storeSecret,
|
|
313
|
+
};
|
|
314
|
+
if (action.id === 'renew') {
|
|
315
|
+
if (action.url)
|
|
316
|
+
io.say(` Mint a new token at ${action.url}, then paste it below.`);
|
|
317
|
+
const v = (await io.askHidden('New value (hidden, Enter to cancel): ')).trim();
|
|
318
|
+
if (v === '') {
|
|
319
|
+
io.say(' cancelled (no value).');
|
|
320
|
+
return;
|
|
321
|
+
}
|
|
322
|
+
deps.value = v;
|
|
323
|
+
}
|
|
324
|
+
else if (action.id === 'forget') {
|
|
325
|
+
if (!(await io.confirm(`Forget compost's local copy of ${item.id}?`, false))) {
|
|
326
|
+
io.say(' cancelled.');
|
|
327
|
+
return;
|
|
328
|
+
}
|
|
329
|
+
}
|
|
330
|
+
else if (action.id === 'pull') {
|
|
331
|
+
if (!(await io.confirm('Pull now (may download several GB)?', true))) {
|
|
332
|
+
io.say(' cancelled.');
|
|
333
|
+
return;
|
|
334
|
+
}
|
|
335
|
+
}
|
|
336
|
+
const result = await runItem(item.id, action.id, deps);
|
|
337
|
+
const glyph = statusGlyph(result.recheck.status);
|
|
338
|
+
io.say(` ${glyph} ${item.id} ${action.id}: ${result.recheck.detail}`);
|
|
339
|
+
const r = result.result;
|
|
340
|
+
if (r.remote_action) {
|
|
341
|
+
io.say(` remote step (yours to do): ${r.remote_action.note} — ${r.remote_action.url}`);
|
|
342
|
+
}
|
|
343
|
+
if (r.env_note)
|
|
344
|
+
io.say(` ${r.env_note}`);
|
|
345
|
+
args.actions.push(`maintained ${item.id}: ${action.id} → ${result.recheck.status}`);
|
|
346
|
+
}
|
|
223
347
|
//# sourceMappingURL=setupWizard.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupWizard.js","sourceRoot":"","sources":["../../src/lib/setupWizard.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"setupWizard.js","sourceRoot":"","sources":["../../src/lib/setupWizard.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/snap.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snap.d.ts","sourceRoot":"","sources":["../../src/lib/snap.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"snap.d.ts","sourceRoot":"","sources":["../../src/lib/snap.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,OAAO,CAAA;CACjB;AAKD,oEAAoE;AACpE,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAkBpD;AA+BD,MAAM,MAAM,MAAM,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,MAAM,CAAA;AAI5D,MAAM,WAAW,WAAW;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,wBAAgB,IAAI,CAClB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,EAAE,EAAE,MAAM,EACV,IAAI,GAAE,WAAgB,GACrB,UAAU,CA6CZ"}
|
package/dist/lib/snap.js
CHANGED
|
@@ -2,6 +2,7 @@ import { execFileSync } from 'node:child_process';
|
|
|
2
2
|
import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync } from 'node:fs';
|
|
3
3
|
import { join } from 'node:path';
|
|
4
4
|
import { CompostError } from '../errors.js';
|
|
5
|
+
import { assertSessionContained } from './sessionId.js';
|
|
5
6
|
const FRAME_WIDTH = 640;
|
|
6
7
|
const FRAME_HEIGHT = 360;
|
|
7
8
|
/** Parse mm:ss, hh:mm:ss, or raw ms (integer) into milliseconds. */
|
|
@@ -53,6 +54,10 @@ function hasVideoStream(path, runner) {
|
|
|
53
54
|
const defaultRunner = (cmd, args) => execFileSync(cmd, args, { encoding: 'utf8' });
|
|
54
55
|
export function snap(seedPath, sessionId, at, opts = {}) {
|
|
55
56
|
const runner = opts.runner ?? defaultRunner;
|
|
57
|
+
// sessionId is joined into the seed path (and written to) below — reject any
|
|
58
|
+
// path-separator/`..` value, and assert containment under the seed, before any
|
|
59
|
+
// fs op (#211 followup).
|
|
60
|
+
assertSessionContained(seedPath, sessionId);
|
|
56
61
|
const atMs = parseTimestamp(at);
|
|
57
62
|
const sessionDir = join(seedPath, 'sessions', sessionId);
|
|
58
63
|
const source = findSource(sessionDir);
|
package/dist/lib/snap.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"snap.js","sourceRoot":"","sources":["../../src/lib/snap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AACzF,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEhC,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"snap.js","sourceRoot":"","sources":["../../src/lib/snap.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
/** Read all of stdin to a string — used for piped secret values (e.g. a token
|
|
2
|
+
* fed via `printf %s "$TOKEN" | compost …`) so they never land in shell
|
|
3
|
+
* history. Returns '' when stdin is an interactive TTY (nothing piped). */
|
|
4
|
+
export declare function readStdin(): Promise<string>;
|
|
5
|
+
//# sourceMappingURL=stdin.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stdin.d.ts","sourceRoot":"","sources":["../../src/lib/stdin.ts"],"names":[],"mappings":"AAAA;;2EAE2E;AAC3E,wBAAsB,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,CAKjD"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/** Read all of stdin to a string — used for piped secret values (e.g. a token
|
|
2
|
+
* fed via `printf %s "$TOKEN" | compost …`) so they never land in shell
|
|
3
|
+
* history. Returns '' when stdin is an interactive TTY (nothing piped). */
|
|
4
|
+
export async function readStdin() {
|
|
5
|
+
if (process.stdin.isTTY)
|
|
6
|
+
return '';
|
|
7
|
+
const chunks = [];
|
|
8
|
+
for await (const chunk of process.stdin)
|
|
9
|
+
chunks.push(Buffer.from(chunk));
|
|
10
|
+
return Buffer.concat(chunks).toString('utf8');
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=stdin.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stdin.js","sourceRoot":"","sources":["../../src/lib/stdin.ts"],"names":[],"mappings":"AAAA;;2EAE2E;AAC3E,MAAM,CAAC,KAAK,UAAU,SAAS;IAC7B,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK;QAAE,OAAO,EAAE,CAAA;IAClC,MAAM,MAAM,GAAa,EAAE,CAAA;IAC3B,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,OAAO,CAAC,KAAK;QAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;IACxE,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;AAC/C,CAAC"}
|
|
@@ -1,11 +1,4 @@
|
|
|
1
|
-
import { type
|
|
2
|
-
/** Injectable spawn surface (real `spawnSync` in prod; a fake in tests). */
|
|
3
|
-
export type SpawnImpl = (cmd: string, args: string[], opts: {
|
|
4
|
-
cwd: string;
|
|
5
|
-
env: NodeJS.ProcessEnv;
|
|
6
|
-
encoding: 'utf8';
|
|
7
|
-
maxBuffer: number;
|
|
8
|
-
}) => Pick<SpawnSyncReturns<string>, 'status' | 'stdout' | 'stderr' | 'error'>;
|
|
1
|
+
import { type SpawnImpl } from './nativeRuntime.js';
|
|
9
2
|
/**
|
|
10
3
|
* Native (host) transcription path (#176): shell out to the transcriber
|
|
11
4
|
* package's `app.transcribe_cli` running in a host Python venv, so Apple-Silicon
|
|
@@ -24,7 +17,9 @@ export interface NativeTranscribeOptions {
|
|
|
24
17
|
model?: string;
|
|
25
18
|
/** Optional language hint (recorded; Parakeet v3 auto-detects). */
|
|
26
19
|
language?: string;
|
|
27
|
-
/** Extra env (e.g. HUGGINGFACE_TOKEN for pyannote).
|
|
20
|
+
/** Extra env (e.g. HUGGINGFACE_TOKEN for pyannote). Layered over a *scrubbed*
|
|
21
|
+
* process.env — the child gets PATH/locale/etc. and only the secrets passed
|
|
22
|
+
* here, never the parent's other tokens (LLM API keys). */
|
|
28
23
|
env?: NodeJS.ProcessEnv;
|
|
29
24
|
/** Injectable spawn (tests). Defaults to node:child_process spawnSync. */
|
|
30
25
|
spawnImpl?: SpawnImpl;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transcribeNative.d.ts","sourceRoot":"","sources":["../../src/lib/transcribeNative.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"transcribeNative.d.ts","sourceRoot":"","sources":["../../src/lib/transcribeNative.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAEjE;;;;;;GAMG;AAEH,MAAM,WAAW,uBAAuB;IACtC,2EAA2E;IAC3E,MAAM,EAAE,MAAM,CAAA;IACd,sEAAsE;IACtE,cAAc,EAAE,MAAM,CAAA;IACtB,mEAAmE;IACnE,MAAM,EAAE,MAAM,CAAA;IACd,2DAA2D;IAC3D,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,mEAAmE;IACnE,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;;+DAE2D;IAC3D,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAA;IACvB,0EAA0E;IAC1E,SAAS,CAAC,EAAE,SAAS,CAAA;CACtB;AAED,MAAM,WAAW,sBAAsB;IACrC,UAAU,EAAE,MAAM,CAAA;IAClB,eAAe,EAAE,MAAM,CAAA;IACvB,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED;;iCAEiC;AACjC,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,uBAAuB,GAC5B,sBAAsB,CAgCxB"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import { spawnSync } from 'node:child_process';
|
|
2
1
|
import { CompostError } from '../errors.js';
|
|
2
|
+
import { childEnv } from './childEnv.js';
|
|
3
|
+
import { runNativeCli } from './nativeRuntime.js';
|
|
3
4
|
/** Run the native transcriber entrypoint synchronously and return its parsed
|
|
4
5
|
* JSON result. Throws a CompostError on spawn failure, non-zero exit, or a
|
|
5
6
|
* `status: "failed"` payload. */
|
|
@@ -20,33 +21,17 @@ export function transcribeNative(seedPath, sessionId, sourcePath, opts) {
|
|
|
20
21
|
args.push('--model', opts.model);
|
|
21
22
|
if (opts.language)
|
|
22
23
|
args.push('--language', opts.language);
|
|
23
|
-
const
|
|
24
|
-
const res = spawn(opts.python, args, {
|
|
24
|
+
const { parsed, status, stderr } = runNativeCli(opts.python, args, {
|
|
25
25
|
cwd: opts.transcriberDir,
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
26
|
+
// Scrub LLM/other secrets from the inherited env; re-add only what the
|
|
27
|
+
// caller passed (the HF token for pyannote) — least privilege (#236).
|
|
28
|
+
env: childEnv(opts.env),
|
|
29
|
+
label: 'transcriber',
|
|
30
|
+
startHint: 'Run `compost setup` to provision the native transcription venv.',
|
|
31
|
+
...(opts.spawnImpl ? { spawnImpl: opts.spawnImpl } : {}),
|
|
29
32
|
});
|
|
30
|
-
if (
|
|
31
|
-
throw new CompostError('PROVIDER_ERROR', `native
|
|
32
|
-
'Run `compost setup` to provision the native transcription venv.');
|
|
33
|
-
}
|
|
34
|
-
// The entrypoint prints exactly one JSON line; take the last non-empty line.
|
|
35
|
-
const lastLine = (res.stdout || '').trim().split('\n').filter(Boolean).pop() ?? '';
|
|
36
|
-
let parsed;
|
|
37
|
-
try {
|
|
38
|
-
// JSON.parse succeeds on primitives (null, 123, "s"); require an object so a
|
|
39
|
-
// stray non-object line surfaces as the CompostError below, not a raw TypeError.
|
|
40
|
-
const value = JSON.parse(lastLine);
|
|
41
|
-
if (typeof value !== 'object' || value === null)
|
|
42
|
-
throw new Error('not a JSON object');
|
|
43
|
-
parsed = value;
|
|
44
|
-
}
|
|
45
|
-
catch {
|
|
46
|
-
throw new CompostError('PROVIDER_ERROR', `native transcriber produced no parseable result. stderr: ${(res.stderr || '').slice(-400)}`);
|
|
47
|
-
}
|
|
48
|
-
if (res.status !== 0 || parsed.status === 'failed') {
|
|
49
|
-
throw new CompostError('PROVIDER_ERROR', `native transcription failed: ${parsed.error ?? (res.stderr || '').slice(-400)}`);
|
|
33
|
+
if (status !== 0 || parsed.status === 'failed') {
|
|
34
|
+
throw new CompostError('PROVIDER_ERROR', `native transcription failed: ${parsed.error ?? stderr.slice(-400)}`);
|
|
50
35
|
}
|
|
51
36
|
return parsed;
|
|
52
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transcribeNative.js","sourceRoot":"","sources":["../../src/lib/transcribeNative.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"transcribeNative.js","sourceRoot":"","sources":["../../src/lib/transcribeNative.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACxC,OAAO,EAAE,YAAY,EAAkB,MAAM,oBAAoB,CAAA;AAsCjE;;iCAEiC;AACjC,MAAM,UAAU,gBAAgB,CAC9B,QAAgB,EAChB,SAAiB,EACjB,UAAkB,EAClB,IAA6B;IAE7B,MAAM,IAAI,GAAG;QACX,IAAI;QACJ,oBAAoB;QACpB,aAAa;QACb,QAAQ;QACR,cAAc;QACd,SAAS;QACT,eAAe;QACf,UAAU;QACV,UAAU;QACV,IAAI,CAAC,MAAM;KACZ,CAAA;IACD,IAAI,IAAI,CAAC,KAAK;QAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,CAAA;IAChD,IAAI,IAAI,CAAC,QAAQ;QAAE,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAA;IAEzD,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,YAAY,CAAyB,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE;QACzF,GAAG,EAAE,IAAI,CAAC,cAAc;QACxB,uEAAuE;QACvE,sEAAsE;QACtE,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC;QACvB,KAAK,EAAE,aAAa;QACpB,SAAS,EAAE,iEAAiE;QAC5E,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACzD,CAAC,CAAA;IACF,IAAI,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/C,MAAM,IAAI,YAAY,CACpB,gBAAgB,EAChB,gCAAgC,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,EAAE,CACrE,CAAA;IACH,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/lib/validate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/lib/validate.ts"],"names":[],"mappings":"AA4DA,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,OAAO,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,OAAO,CAAA;CAChB;AAaD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAU/D;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAwBjE;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAuCzD;AAED,MAAM,WAAW,gBAAgB;IAC/B,EAAE,EAAE,OAAO,CAAA;IACX,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,OAAO,CAAA;CAChB;AAED,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,OAAO,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,cAAc,EAAE,CAAA;IAC7B,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAAA;CAChC;AAiCD;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,kBAAkB,CAsBjE;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAqC3D"}
|
package/dist/lib/validate.js
CHANGED
|
@@ -4,6 +4,7 @@ import { Ajv2020 } from 'ajv/dist/2020.js';
|
|
|
4
4
|
import addFormatsImport from 'ajv-formats';
|
|
5
5
|
import Database from 'better-sqlite3';
|
|
6
6
|
import { CompostError } from '../errors.js';
|
|
7
|
+
import { eventsDbPath } from './events.js';
|
|
7
8
|
import { CUES_TAXONOMY, EVENTS_SCHEMA, FRAMES_TAXONOMY, TRANSCRIPT_SCHEMA, } from './schemas.generated.js';
|
|
8
9
|
const addFormats = addFormatsImport.default ??
|
|
9
10
|
addFormatsImport;
|
|
@@ -183,7 +184,7 @@ export function validateSeed(seedPath) {
|
|
|
183
184
|
transcripts.push(validateTranscript(join(legacyDir, f)));
|
|
184
185
|
}
|
|
185
186
|
}
|
|
186
|
-
const events = validateSeedEvents(
|
|
187
|
+
const events = validateSeedEvents(eventsDbPath(seedPath));
|
|
187
188
|
const ok = transcripts.every((t) => t.ok) && (events === null || events.ok);
|
|
188
189
|
return { ok, seed: seedPath, transcripts, events };
|
|
189
190
|
}
|
package/dist/lib/validate.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/lib/validate.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/lib/validate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/lib/version.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAIhD,eAAO,MAAM,YAAY,gCAAgC,CAAA;AACzD,eAAO,MAAM,eAAe,sDAA0C,CAAA;AAEtE;;8BAE8B;AAC9B,wBAAgB,iBAAiB,IAAI,MAAM,CAK1C;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAkB5D;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,OAAO,CAAA;CAChB;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE;IAC7C,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/lib/version.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAIhD,eAAO,MAAM,YAAY,gCAAgC,CAAA;AACzD,eAAO,MAAM,eAAe,sDAA0C,CAAA;AAEtE;;8BAE8B;AAC9B,wBAAgB,iBAAiB,IAAI,MAAM,CAK1C;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAkB5D;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,OAAO,CAAA;CAChB;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE;IAC7C,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAiBhC"}
|
package/dist/lib/version.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { readFileSync } from 'node:fs';
|
|
2
2
|
import { dirname, join } from 'node:path';
|
|
3
3
|
import { fileURLToPath } from 'node:url';
|
|
4
|
-
import { resolveFetch } from '../llm/http.js';
|
|
4
|
+
import { fetchWithTimeout, resolveFetch } from '../llm/http.js';
|
|
5
5
|
const __dirname = dirname(fileURLToPath(import.meta.url));
|
|
6
6
|
export const PACKAGE_NAME = '@they-juanreina/compost-cli';
|
|
7
7
|
export const UPGRADE_COMMAND = `npm install -g ${PACKAGE_NAME}@latest`;
|
|
@@ -49,13 +49,8 @@ export function compareVersions(a, b) {
|
|
|
49
49
|
export async function checkVersionStatus(deps) {
|
|
50
50
|
const fetchImpl = resolveFetch(deps.fetchImpl);
|
|
51
51
|
const current = deps.current ?? currentCliVersion();
|
|
52
|
-
const controller = new AbortController();
|
|
53
|
-
const timer = setTimeout(() => controller.abort(), deps.timeoutMs ?? 2500);
|
|
54
52
|
try {
|
|
55
|
-
const res = await fetchImpl
|
|
56
|
-
method: 'GET',
|
|
57
|
-
signal: controller.signal,
|
|
58
|
-
});
|
|
53
|
+
const res = await fetchWithTimeout(fetchImpl, `https://registry.npmjs.org/-/package/${PACKAGE_NAME}/dist-tags`, { method: 'GET' }, deps.timeoutMs ?? 2500);
|
|
59
54
|
if (!res.ok)
|
|
60
55
|
return null;
|
|
61
56
|
const tags = (await res.json());
|
|
@@ -66,8 +61,5 @@ export async function checkVersionStatus(deps) {
|
|
|
66
61
|
catch {
|
|
67
62
|
return null;
|
|
68
63
|
}
|
|
69
|
-
finally {
|
|
70
|
-
clearTimeout(timer);
|
|
71
|
-
}
|
|
72
64
|
}
|
|
73
65
|
//# sourceMappingURL=version.js.map
|
package/dist/lib/version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/lib/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AACtC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAExC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/lib/version.ts"],"names":[],"mappings":"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"}
|
package/dist/llm/adapter.d.ts
CHANGED
|
@@ -22,6 +22,11 @@ export declare class LLMAdapter {
|
|
|
22
22
|
maxTokens?: number;
|
|
23
23
|
}): Promise<ChatResponse>;
|
|
24
24
|
embed(task: string, input: string[]): Promise<EmbedResponse>;
|
|
25
|
+
/** Turn a 401/403 from a key-requiring provider into an actionable
|
|
26
|
+
* PROVIDER_AUTH error (the key is present but rejected — revoked/expired/wrong
|
|
27
|
+
* scope), instead of a raw `POST … → 401` string surfacing as code INTERNAL.
|
|
28
|
+
* Mirrors the HF-token UX. Non-auth errors pass through unchanged. */
|
|
29
|
+
private tagAuthError;
|
|
25
30
|
/** Fail fast with an actionable message when a task routes to a key-requiring
|
|
26
31
|
* provider whose key isn't set — instead of a raw 401 from the HTTP layer. A
|
|
27
32
|
* provider needs a key iff it declares `api_key_env` in [providers] (local
|
|
@@ -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;
|
|
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;AAMlG,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;IAUlB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC;IAUlE;;;0EAGsE;IACtE,OAAO,CAAC,YAAY;IAUpB;;;gDAG4C;IAC5C,OAAO,CAAC,oBAAoB;IAW5B,oFAAoF;IAC9E,SAAS,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;CAqB3D"}
|