ptbk 0.119.0-21 → 0.119.0-26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +16 -9
- package/dist/browser/browser.d.ts +50 -36
- package/dist/browser/browser.js +162 -118
- package/dist/browser/browser.js.map +1 -1
- package/dist/browser/fleet.d.ts +59 -0
- package/dist/browser/fleet.js +148 -0
- package/dist/browser/fleet.js.map +1 -0
- package/dist/browser/recording.js +2 -2
- package/dist/browser/recording.js.map +1 -1
- package/dist/chats/conversation.d.ts +1 -1
- package/dist/chats/conversation.js +8 -6
- package/dist/chats/conversation.js.map +1 -1
- package/dist/chats/local.js +5 -5
- package/dist/chats/local.js.map +1 -1
- package/dist/cli/commands/add.js +1 -1
- package/dist/cli/commands/add.js.map +1 -1
- package/dist/cli/commands/boilerplates.js +1 -1
- package/dist/cli/commands/boilerplates.js.map +1 -1
- package/dist/cli/commands/find.js +1 -1
- package/dist/cli/commands/find.js.map +1 -1
- package/dist/cli/commands/fix.js +9 -4
- package/dist/cli/commands/fix.js.map +1 -1
- package/dist/cli/commands/init.d.ts +5 -0
- package/dist/cli/commands/init.js +279 -118
- package/dist/cli/commands/init.js.map +1 -1
- package/dist/cli/commands/migrate.js +1 -1
- package/dist/cli/commands/migrate.js.map +1 -1
- package/dist/cli/commands/ping.js +20 -12
- package/dist/cli/commands/ping.js.map +1 -1
- package/dist/cli/commands/plan.js +20 -12
- package/dist/cli/commands/plan.js.map +1 -1
- package/dist/cli/commands/recover.js +1 -1
- package/dist/cli/commands/recover.js.map +1 -1
- package/dist/cli/commands/restart.js +6 -5
- package/dist/cli/commands/restart.js.map +1 -1
- package/dist/cli/commands/run.js +26 -15
- package/dist/cli/commands/run.js.map +1 -1
- package/dist/cli/commands/start.js +11 -7
- package/dist/cli/commands/start.js.map +1 -1
- package/dist/cli/commands/tool.d.ts +19 -0
- package/dist/cli/commands/tool.js +320 -0
- package/dist/cli/commands/tool.js.map +1 -0
- package/dist/cli/commands/verify.js +1 -1
- package/dist/cli/commands/verify.js.map +1 -1
- package/dist/cli/common.d.ts +7 -1
- package/dist/cli/common.js +37 -20
- package/dist/cli/common.js.map +1 -1
- package/dist/cli/compatibility.d.ts +8 -0
- package/dist/cli/compatibility.js +32 -0
- package/dist/cli/compatibility.js.map +1 -0
- package/dist/cli/parser.js +7 -3
- package/dist/cli/parser.js.map +1 -1
- package/dist/cli/registry.js +182 -7
- package/dist/cli/registry.js.map +1 -1
- package/dist/cli/service-view.js +1 -1
- package/dist/cli/service-view.js.map +1 -1
- package/dist/cli/sources.js +2 -0
- package/dist/cli/sources.js.map +1 -1
- package/dist/cli/spec.js +8 -6
- package/dist/cli/spec.js.map +1 -1
- package/dist/common/naming.d.ts +53 -0
- package/dist/common/naming.js +90 -0
- package/dist/common/naming.js.map +1 -0
- package/dist/engine/agenda.d.ts +70 -9
- package/dist/engine/agenda.js +294 -61
- package/dist/engine/agenda.js.map +1 -1
- package/dist/engine/executor.d.ts +5 -0
- package/dist/engine/executor.js +24 -11
- package/dist/engine/executor.js.map +1 -1
- package/dist/engine/harnesses.d.ts +82 -18
- package/dist/engine/harnesses.js +191 -39
- package/dist/engine/harnesses.js.map +1 -1
- package/dist/engine/preview.js +2 -2
- package/dist/engine/preview.js.map +1 -1
- package/dist/engine/routing.d.ts +10 -0
- package/dist/engine/routing.js +67 -28
- package/dist/engine/routing.js.map +1 -1
- package/dist/engine/snapshot.d.ts +107 -7
- package/dist/engine/state.d.ts +4 -2
- package/dist/engine/state.js.map +1 -1
- package/dist/engine/sync.d.ts +96 -0
- package/dist/engine/sync.js +199 -0
- package/dist/engine/sync.js.map +1 -0
- package/dist/engine/team.d.ts +1 -0
- package/dist/engine/team.js +12 -8
- package/dist/engine/team.js.map +1 -1
- package/dist/expert/_main.md +96 -67
- package/dist/expert/agents/_index.md +10 -7
- package/dist/expert/agents/core-agents.md +4 -2
- package/dist/expert/agents/fixer.md +15 -12
- package/dist/expert/cli/acceptance.md +96 -78
- package/dist/expert/cli/api.md +26 -14
- package/dist/expert/cli/autonomous-operation.md +17 -19
- package/dist/expert/cli/browser.md +24 -24
- package/dist/expert/cli/checks.md +18 -10
- package/dist/expert/cli/cli.md +48 -41
- package/dist/expert/cli/configuration-migrations.md +43 -0
- package/dist/expert/cli/configuration.md +24 -14
- package/dist/expert/cli/controls.md +23 -11
- package/dist/expert/cli/dashboard-details.md +28 -10
- package/dist/expert/cli/dashboard-layout.md +15 -15
- package/dist/expert/cli/dashboard.md +8 -10
- package/dist/expert/cli/environment.md +33 -0
- package/dist/expert/cli/execution.md +10 -8
- package/dist/expert/cli/git-persistence.md +27 -21
- package/dist/expert/cli/git-preflight.md +8 -4
- package/dist/expert/cli/git-synchronization.md +32 -6
- package/dist/expert/cli/harness-plugins.md +12 -12
- package/dist/expert/cli/harnesses.md +22 -16
- package/dist/expert/cli/initialization-ui.md +14 -14
- package/dist/expert/cli/initialization.md +31 -21
- package/dist/expert/cli/installation.md +6 -0
- package/dist/expert/cli/isolation.md +5 -3
- package/dist/expert/cli/releasing.md +17 -3
- package/dist/expert/cli/retries.md +10 -8
- package/dist/expert/cli/run.md +7 -5
- package/dist/expert/cli/start.md +21 -15
- package/dist/expert/cli/status-view.md +15 -17
- package/dist/expert/cli/synchronization-setup.md +24 -0
- package/dist/expert/cli/terminal.md +14 -16
- package/dist/expert/cli/tool-management.md +60 -0
- package/dist/expert/cli/tool-runtime.md +35 -0
- package/dist/expert/cli/tools-migration.md +50 -0
- package/dist/expert/cli/tools.md +73 -0
- package/dist/expert/cli/trace-configuration.md +9 -11
- package/dist/expert/cli/updates.md +7 -7
- package/dist/expert/cli/windows-installer.md +67 -0
- package/dist/expert/cli/workspace.md +2 -0
- package/dist/expert/coding-standards/_index.md +11 -0
- package/dist/expert/coding-standards/naming.md +30 -0
- package/dist/expert/coding-standards/shared-logic.md +27 -0
- package/dist/expert/concepts/automatic-repair.md +33 -0
- package/dist/expert/concepts/engine-and-project.md +7 -5
- package/dist/expert/dictionary.md +18 -18
- package/dist/harness/plugins/claude-code/index.js +4 -2
- package/dist/harness/plugins/claude-code/index.js.map +1 -1
- package/dist/harness/plugins/cline/index.js +1 -0
- package/dist/harness/plugins/cline/index.js.map +1 -1
- package/dist/harness/plugins/gemini/index.js +2 -0
- package/dist/harness/plugins/gemini/index.js.map +1 -1
- package/dist/harness/plugins/github-copilot/index.js +1 -0
- package/dist/harness/plugins/github-copilot/index.js.map +1 -1
- package/dist/harness/plugins/openai-codex/index.js +13 -9
- package/dist/harness/plugins/openai-codex/index.js.map +1 -1
- package/dist/harness/plugins/opencode/index.js +1 -0
- package/dist/harness/plugins/opencode/index.js.map +1 -1
- package/dist/harness/plugins/qwen-code/index.js +1 -0
- package/dist/harness/plugins/qwen-code/index.js.map +1 -1
- package/dist/harness/types.d.ts +16 -5
- package/dist/project/config.d.ts +135 -48
- package/dist/project/config.js +331 -119
- package/dist/project/config.js.map +1 -1
- package/dist/project/configuration.d.ts +43 -0
- package/dist/project/configuration.js +165 -0
- package/dist/project/configuration.js.map +1 -0
- package/dist/project/defaults.d.ts +4 -2
- package/dist/project/defaults.js +10 -5
- package/dist/project/defaults.js.map +1 -1
- package/dist/project/git.d.ts +28 -0
- package/dist/project/git.js +81 -0
- package/dist/project/git.js.map +1 -1
- package/dist/project/migrations.d.ts +96 -0
- package/dist/project/migrations.js +301 -0
- package/dist/project/migrations.js.map +1 -0
- package/dist/project/publication.d.ts +57 -0
- package/dist/project/publication.js +117 -0
- package/dist/project/publication.js.map +1 -0
- package/dist/project/readiness.d.ts +14 -5
- package/dist/project/readiness.js +23 -22
- package/dist/project/readiness.js.map +1 -1
- package/dist/project/setup.js +2 -0
- package/dist/project/setup.js.map +1 -1
- package/dist/service/actions.d.ts +12 -4
- package/dist/service/actions.js +32 -2
- package/dist/service/actions.js.map +1 -1
- package/dist/service/control.d.ts +1 -1
- package/dist/service/control.js +1 -1
- package/dist/service/host.d.ts +5 -2
- package/dist/service/host.js +26 -16
- package/dist/service/host.js.map +1 -1
- package/dist/service/http.js +7 -2
- package/dist/service/http.js.map +1 -1
- package/dist/service/launcher.d.ts +2 -1
- package/dist/service/launcher.js +1 -0
- package/dist/service/launcher.js.map +1 -1
- package/dist/service/records.d.ts +3 -0
- package/dist/service/records.js +1 -1
- package/dist/service/records.js.map +1 -1
- package/dist/service/spa/app.css +39 -0
- package/dist/service/spa/app.js +242 -39
- package/dist/service/worker.js +1 -0
- package/dist/service/worker.js.map +1 -1
- package/dist/tools/environment.d.ts +122 -0
- package/dist/tools/environment.js +199 -0
- package/dist/tools/environment.js.map +1 -0
- package/dist/tools/model.d.ts +180 -0
- package/dist/tools/model.js +111 -0
- package/dist/tools/model.js.map +1 -0
- package/dist/tools/normalize.d.ts +51 -0
- package/dist/tools/normalize.js +321 -0
- package/dist/tools/normalize.js.map +1 -0
- package/dist/tools/operations.d.ts +198 -0
- package/dist/tools/operations.js +378 -0
- package/dist/tools/operations.js.map +1 -0
- package/dist/tools/readiness.d.ts +72 -0
- package/dist/tools/readiness.js +160 -0
- package/dist/tools/readiness.js.map +1 -0
- package/dist/ui/dashboard.d.ts +3 -0
- package/dist/ui/dashboard.js +173 -2
- package/dist/ui/dashboard.js.map +1 -1
- package/dist/ui/details.d.ts +35 -1
- package/dist/ui/details.js +103 -2
- package/dist/ui/details.js.map +1 -1
- package/dist/ui/secret.d.ts +8 -0
- package/dist/ui/secret.js +41 -0
- package/dist/ui/secret.js.map +1 -0
- package/dist/ui/status-view.d.ts +1 -0
- package/dist/ui/status-view.js +33 -8
- package/dist/ui/status-view.js.map +1 -1
- package/dist/ui/tool-forms.d.ts +24 -0
- package/dist/ui/tool-forms.js +133 -0
- package/dist/ui/tool-forms.js.map +1 -0
- package/package.json +1 -1
|
@@ -69,7 +69,7 @@ export default async function recover(context) {
|
|
|
69
69
|
const instanceId = shortId(12);
|
|
70
70
|
const release = await acquireProjectLock(project, instanceId, 'recovery');
|
|
71
71
|
try {
|
|
72
|
-
const agenda = new Agenda({ project, mode: 'run', instanceId, env: context.env, cli: { 'server.
|
|
72
|
+
const agenda = new Agenda({ project, mode: 'run', instanceId, env: context.env, cli: { 'server.isEnabled': false }, persistent: null });
|
|
73
73
|
await agenda.initialize();
|
|
74
74
|
const message = await agenda.recover(reference, action);
|
|
75
75
|
terminal.write(`${message}${action === 'resume' || action === 'retry' ? ' The work continues on the next `ptbk start` (or `ptbk run --git-changes continue`).' : ''}\n`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recover.js","sourceRoot":"","sources":["../../../src/cli/commands/recover.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"recover.js","sourceRoot":"","sources":["../../../src/cli/commands/recover.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { lookupService } from '../../service/control.js';
|
|
|
3
3
|
import { launchDaemon, restartService, stopService } from '../../service/launcher.js';
|
|
4
4
|
import { registerPersistence, unregisterPersistence } from '../../service/persistence.js';
|
|
5
5
|
import { readLaunchMetadata } from '../../service/records.js';
|
|
6
|
-
import { selectedProject, settingOverrides, tasksOverride, validateCombinations } from '../common.js';
|
|
6
|
+
import { browserOverrides, selectedProject, settingOverrides, tasksOverride, validateCombinations } from '../common.js';
|
|
7
7
|
import { option } from '../context.js';
|
|
8
8
|
import { liveSnapshot, renderServiceResult } from '../service-view.js';
|
|
9
9
|
/**
|
|
@@ -29,7 +29,8 @@ export default async function restart(context) {
|
|
|
29
29
|
const previous = await readLaunchMetadata(project);
|
|
30
30
|
const overrides = { ...(previous?.cli ?? {}), ...settingOverrides(context) };
|
|
31
31
|
const cliHarnesses = option(context, 'harness') ?? previous?.cliHarnesses;
|
|
32
|
-
const
|
|
32
|
+
const cliBrowser = browserOverrides(context) ?? previous?.cliBrowser;
|
|
33
|
+
const persistent = overrides['service.isPersistent'] !== false;
|
|
33
34
|
const tasksDirectory = tasksOverride(context) ?? previous?.tasksDirectory;
|
|
34
35
|
const lookup = await lookupService(project);
|
|
35
36
|
if (lookup.state === 'unreachable') {
|
|
@@ -45,7 +46,7 @@ export default async function restart(context) {
|
|
|
45
46
|
next: ['Restart without options (`ptbk restart`), or stop it and start it again with the new options.'],
|
|
46
47
|
});
|
|
47
48
|
}
|
|
48
|
-
const result = await restartService(project, lookup, { launch: { cli: overrides, cliHarnesses, tasksDirectory, persistent }, timeoutMs: option(context, 'timeout') });
|
|
49
|
+
const result = await restartService(project, lookup, { launch: { cli: overrides, cliHarnesses, cliBrowser, tasksDirectory, persistent }, timeoutMs: option(context, 'timeout') });
|
|
49
50
|
if (result.kind === 'pending') {
|
|
50
51
|
const current = await lookupService(project);
|
|
51
52
|
const view = current.state === 'running' ? await liveSnapshot(project, current) : undefined;
|
|
@@ -62,7 +63,7 @@ export default async function restart(context) {
|
|
|
62
63
|
context.terminal.write(`${stopped.message}\n`);
|
|
63
64
|
return EXIT.incomplete;
|
|
64
65
|
}
|
|
65
|
-
const launched = await launchDaemon(project, { cli: overrides, cliHarnesses, tasksDirectory, persistent, env: context.env });
|
|
66
|
+
const launched = await launchDaemon(project, { cli: overrides, cliHarnesses, cliBrowser, tasksDirectory, persistent, env: context.env });
|
|
66
67
|
replacement = launched.lookup;
|
|
67
68
|
message = `The previous service (an older engine) stopped; one replacement runs in the background (PID ${launched.lookup.record.pid}).`;
|
|
68
69
|
}
|
|
@@ -78,7 +79,7 @@ export default async function restart(context) {
|
|
|
78
79
|
}
|
|
79
80
|
}
|
|
80
81
|
else {
|
|
81
|
-
const launched = await launchDaemon(project, { cli: overrides, cliHarnesses, tasksDirectory, persistent, env: context.env });
|
|
82
|
+
const launched = await launchDaemon(project, { cli: overrides, cliHarnesses, cliBrowser, tasksDirectory, persistent, env: context.env });
|
|
82
83
|
replacement = launched.lookup;
|
|
83
84
|
message = `No service was running; the agenda runs in the background (PID ${launched.lookup.record.pid}).${launched.persistence ? ` ${launched.persistence.note}` : ''}`;
|
|
84
85
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"restart.js","sourceRoot":"","sources":["../../../src/cli/commands/restart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAsB,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACtF,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAC1F,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"restart.js","sourceRoot":"","sources":["../../../src/cli/commands/restart.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/commands/run.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { EXIT, PtbkError } from '../../common/errors.js';
|
|
2
2
|
import { clockTime, formatShortTime } from '../../common/time.js';
|
|
3
|
-
import { assertValidSettings, loadSettings, setting } from '../../project/config.js';
|
|
3
|
+
import { assertValidSettings, enabledHarnesses, loadSettings, setting } from '../../project/config.js';
|
|
4
|
+
import { harnessPluginId } from '../../tools/model.js';
|
|
4
5
|
import { runCheck } from '../../project/checks.js';
|
|
5
6
|
import { inspectGit } from '../../project/git.js';
|
|
6
7
|
import { previewQueue } from '../../engine/preview.js';
|
|
@@ -9,27 +10,31 @@ import { lookupService } from '../../service/control.js';
|
|
|
9
10
|
import { harnessPlugin } from '../../harness/registry.js';
|
|
10
11
|
import { runDashboard } from '../../ui/dashboard.js';
|
|
11
12
|
import { confirm } from '../../ui/prompts.js';
|
|
12
|
-
import { printJson, selectedProject, settingOverrides, tasksOverride, validateCombinations } from '../common.js';
|
|
13
|
+
import { browserOverrides, printJson, selectedProject, settingOverrides, tasksOverride, validateCombinations } from '../common.js';
|
|
13
14
|
import { flag, option } from '../context.js';
|
|
14
15
|
import { hostSource } from '../sources.js';
|
|
15
16
|
import { ownerSignals } from '../lifecycle.js';
|
|
16
17
|
/**
|
|
17
|
-
* Resolves the one configuration of a finite run (flags, then project defaults, then legacy environment).
|
|
18
|
+
* Resolves the one configuration of a finite run (flags, then project defaults, then legacy environment). The harness
|
|
19
|
+
* is a variant (its ordered same-variant instances may serve it) or one explicitly named instance.
|
|
18
20
|
*/
|
|
19
|
-
|
|
20
|
-
const harness = option(context, 'harness') ?? setting(settings, 'routing.harness') ??
|
|
21
|
+
function runSelection(context, settings) {
|
|
22
|
+
const harness = option(context, 'harness') ?? setting(settings, 'routing.harness') ?? enabledHarnesses(settings)[0];
|
|
21
23
|
if (!harness) {
|
|
22
|
-
throw new PtbkError('No harness is selected for this run.', { kind: 'setup', next: ['Pass `--harness <
|
|
24
|
+
throw new PtbkError('No harness is selected for this run.', { kind: 'setup', next: ['Pass `--harness <variant|tool>` or enable a harness tool (`ptbk tool list`).'] });
|
|
23
25
|
}
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
26
|
+
const instance = settings.tools.find((tool) => tool.type === 'HARNESS' && tool.name === harness);
|
|
27
|
+
if (!harnessPlugin(harness) && !instance)
|
|
28
|
+
throw new PtbkError(`Unknown harness "${harness}".`, { kind: 'usage', next: ['Use a variant such as openai-codex or a harness tool name from `ptbk tool list`.'] });
|
|
29
|
+
const variant = instance ? harnessPluginId(instance.variant) : harness;
|
|
30
|
+
const preferred = instance ?? settings.tools.find((tool) => tool.type === 'HARNESS' && tool.isEnabled && harnessPluginId(tool.variant) === variant);
|
|
31
|
+
const isDefault = setting(settings, 'routing.harness') === variant;
|
|
27
32
|
const agentName = option(context, 'agent') ?? setting(settings, 'routing.defaultAgent');
|
|
28
33
|
return {
|
|
29
34
|
agent: agentName.startsWith('@') || agentName.startsWith('{') ? agentName : `{{${agentName}}}`,
|
|
30
35
|
harness,
|
|
31
|
-
model: option(context, 'model') ??
|
|
32
|
-
thinkingLevel: option(context, 'thinking-level') ??
|
|
36
|
+
model: option(context, 'model') ?? preferred?.model ?? (isDefault ? setting(settings, 'routing.model') : undefined),
|
|
37
|
+
thinkingLevel: option(context, 'thinking-level') ?? preferred?.thinkingLevel ?? (isDefault ? setting(settings, 'routing.thinkingLevel') : undefined),
|
|
33
38
|
};
|
|
34
39
|
}
|
|
35
40
|
/**
|
|
@@ -42,13 +47,17 @@ export default async function run(context) {
|
|
|
42
47
|
const project = await selectedProject(context);
|
|
43
48
|
const overrides = settingOverrides(context);
|
|
44
49
|
if (flag(context, 'server') !== true)
|
|
45
|
-
overrides['server.
|
|
46
|
-
const
|
|
50
|
+
overrides['server.isEnabled'] = false;
|
|
51
|
+
const browser = browserOverrides(context);
|
|
52
|
+
const base = await loadSettings(project, { env: context.env, cli: overrides, cliBrowser: browser });
|
|
53
|
+
// The run uses one harness: a variant without a configured instance gets a temporary native one (never saved).
|
|
54
|
+
const chosen = option(context, 'harness') ?? setting(base, 'routing.harness') ?? enabledHarnesses(base)[0];
|
|
55
|
+
const cliHarnesses = chosen ? [chosen] : undefined;
|
|
56
|
+
const settings = cliHarnesses ? await loadSettings(project, { env: context.env, cli: overrides, cliBrowser: browser, cliHarnesses }) : base;
|
|
47
57
|
assertValidSettings(settings, project);
|
|
48
58
|
const { terminal } = context;
|
|
49
59
|
const dryRun = flag(context, 'dry-run') === true;
|
|
50
|
-
const
|
|
51
|
-
const selection = await runSelection(context, settings, usableFromConfig);
|
|
60
|
+
const selection = runSelection(context, settings);
|
|
52
61
|
const preview = await previewQueue(project, { settings, mode: 'run', runSelection: selection, tasksDirectory: tasksOverride(context), env: context.env });
|
|
53
62
|
const minimum = option(context, 'min-priority');
|
|
54
63
|
const maximum = option(context, 'max-priority');
|
|
@@ -107,6 +116,8 @@ export default async function run(context) {
|
|
|
107
116
|
mode: 'run',
|
|
108
117
|
env: context.env,
|
|
109
118
|
cli: overrides,
|
|
119
|
+
cliHarnesses,
|
|
120
|
+
cliBrowser: browser,
|
|
110
121
|
tasksDirectory: tasksOverride(context),
|
|
111
122
|
persistent: null,
|
|
112
123
|
allowTunnelInstall: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/cli/commands/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,OAAO,EAAsB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/cli/commands/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { EXIT, PtbkError } from '../../common/errors.js';
|
|
2
|
+
import { requireEngineUpdate } from '../compatibility.js';
|
|
2
3
|
import { clockTime } from '../../common/time.js';
|
|
3
4
|
import { loadSettings, setting } from '../../project/config.js';
|
|
4
5
|
import { assessReadiness } from '../../project/readiness.js';
|
|
@@ -8,7 +9,7 @@ import { launchDaemon } from '../../service/launcher.js';
|
|
|
8
9
|
import { readLaunchMetadata, restoreDiscoveryEnvironment } from '../../service/records.js';
|
|
9
10
|
import { runDashboard } from '../../ui/dashboard.js';
|
|
10
11
|
import { confirm } from '../../ui/prompts.js';
|
|
11
|
-
import { selectedProject, settingOverrides, tasksOverride, validateCombinations } from '../common.js';
|
|
12
|
+
import { browserOverrides, selectedProject, settingOverrides, tasksOverride, validateCombinations } from '../common.js';
|
|
12
13
|
import { flag, option } from '../context.js';
|
|
13
14
|
import { liveSnapshot, renderServiceResult } from '../service-view.js';
|
|
14
15
|
import { hostSource } from '../sources.js';
|
|
@@ -26,7 +27,9 @@ function describeProblems(problems) {
|
|
|
26
27
|
* Returns false when setup stays incomplete.
|
|
27
28
|
*/
|
|
28
29
|
async function ensureReady(context, project, overrides, cliHarnesses) {
|
|
29
|
-
let settings = await loadSettings(project, { env: context.env, cli: overrides, cliHarnesses });
|
|
30
|
+
let settings = await loadSettings(project, { env: context.env, cli: overrides, cliHarnesses, cliBrowser: browserOverrides(context) });
|
|
31
|
+
if (settings.migration.kind === 'older-engine')
|
|
32
|
+
await requireEngineUpdate(context, settings.migration.saved);
|
|
30
33
|
let readiness = await assessReadiness(project, settings, context.env);
|
|
31
34
|
if (readiness.ready)
|
|
32
35
|
return true;
|
|
@@ -50,7 +53,7 @@ async function ensureReady(context, project, overrides, cliHarnesses) {
|
|
|
50
53
|
const result = await initializeProject(context, { projectRoot: project.root, fromStart: true });
|
|
51
54
|
if (result.outcome !== 'ready')
|
|
52
55
|
return false;
|
|
53
|
-
settings = await loadSettings(project, { env: context.env, cli: overrides, cliHarnesses });
|
|
56
|
+
settings = await loadSettings(project, { env: context.env, cli: overrides, cliHarnesses, cliBrowser: browserOverrides(context) });
|
|
54
57
|
readiness = await assessReadiness(project, settings, context.env);
|
|
55
58
|
if (!readiness.ready)
|
|
56
59
|
terminal.write(`${terminal.style.error('Setup is still incomplete:')}\n${describeProblems(readiness.problems)}\n`);
|
|
@@ -86,7 +89,7 @@ async function resumeService(context, project) {
|
|
|
86
89
|
if (lookup.state === 'running')
|
|
87
90
|
return EXIT.success;
|
|
88
91
|
const env = restoreDiscoveryEnvironment(launch.env, launch.nodePath);
|
|
89
|
-
const result = await launchDaemon(project, { cli: launch.cli, cliHarnesses: launch.cliHarnesses, tasksDirectory: launch.tasksDirectory, persistent: true, env });
|
|
92
|
+
const result = await launchDaemon(project, { cli: launch.cli, cliHarnesses: launch.cliHarnesses, cliBrowser: launch.cliBrowser, tasksDirectory: launch.tasksDirectory, persistent: true, env });
|
|
90
93
|
context.terminal.write(`Resumed ptbk service (PID ${result.lookup.record.pid}).\n`);
|
|
91
94
|
return EXIT.success;
|
|
92
95
|
}
|
|
@@ -104,6 +107,7 @@ async function runForeground(context, project, overrides, cliHarnesses) {
|
|
|
104
107
|
env: context.env,
|
|
105
108
|
cli: overrides,
|
|
106
109
|
cliHarnesses,
|
|
110
|
+
cliBrowser: browserOverrides(context),
|
|
107
111
|
tasksDirectory: tasksOverride(context),
|
|
108
112
|
persistent: false,
|
|
109
113
|
persistenceNote: 'Foreground: stops with this terminal; no restart persistence.',
|
|
@@ -169,9 +173,9 @@ export default async function start(context) {
|
|
|
169
173
|
}
|
|
170
174
|
if (flag(context, 'foreground'))
|
|
171
175
|
return await runForeground(context, project, overrides, cliHarnesses);
|
|
172
|
-
const settings = await loadSettings(project, { env: context.env, cli: overrides, cliHarnesses });
|
|
173
|
-
const persistent = setting(settings, 'service.
|
|
174
|
-
const result = await launchDaemon(project, { cli: overrides, cliHarnesses, tasksDirectory: tasksOverride(context), persistent, env: context.env });
|
|
176
|
+
const settings = await loadSettings(project, { env: context.env, cli: overrides, cliHarnesses, cliBrowser: browserOverrides(context) });
|
|
177
|
+
const persistent = setting(settings, 'service.isPersistent');
|
|
178
|
+
const result = await launchDaemon(project, { cli: overrides, cliHarnesses, cliBrowser: browserOverrides(context), tasksDirectory: tasksOverride(context), persistent, env: context.env });
|
|
175
179
|
const snapshot = await settledSnapshot(() => liveSnapshot(project, result.lookup));
|
|
176
180
|
const persistence = result.persistence ? ` ${result.persistence.note}` : persistent ? '' : ' Restart persistence is disabled (--no-persist).';
|
|
177
181
|
await renderServiceResult(context, snapshot, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/cli/commands/start.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,eAAe,EAAyB,MAAM,4BAA4B,CAAC;AAGpF,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,kBAAkB,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/cli/commands/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { type CommandContext } from '../context.js';
|
|
2
|
+
/**
|
|
3
|
+
* `ptbk tool list`: the ordered inventory with enabled, usable and in-use state (read-only).
|
|
4
|
+
*
|
|
5
|
+
* @private command
|
|
6
|
+
*/
|
|
7
|
+
export declare function list(context: CommandContext): Promise<number>;
|
|
8
|
+
/**
|
|
9
|
+
* `ptbk tool show <name>`: non-secret configuration and actual diagnostics of one instance (read-only).
|
|
10
|
+
*
|
|
11
|
+
* @private command
|
|
12
|
+
*/
|
|
13
|
+
export declare function show(context: CommandContext): Promise<number>;
|
|
14
|
+
/**
|
|
15
|
+
* `ptbk tool add|modify|enable|disable|remove|delete|move`.
|
|
16
|
+
*
|
|
17
|
+
* @private command
|
|
18
|
+
*/
|
|
19
|
+
export default function tool(context: CommandContext): Promise<number>;
|