@felan-ai/felan 0.34.1 → 0.34.2
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/acp/daemon-session.d.ts +1 -0
- package/dist/acp/daemon-session.d.ts.map +1 -1
- package/dist/acp/daemon-session.js +6 -0
- package/dist/acp/daemon-session.js.map +1 -1
- package/dist/acp/session-registry.d.ts.map +1 -1
- package/dist/acp/session-registry.js +5 -1
- package/dist/acp/session-registry.js.map +1 -1
- package/dist/client/build-mismatch.d.ts +4 -0
- package/dist/client/build-mismatch.d.ts.map +1 -0
- package/dist/client/build-mismatch.js +28 -0
- package/dist/client/build-mismatch.js.map +1 -0
- package/dist/client/client.d.ts +10 -1
- package/dist/client/client.d.ts.map +1 -1
- package/dist/client/client.js +30 -11
- package/dist/client/client.js.map +1 -1
- package/dist/client-application.d.ts +1 -1
- package/dist/client-application.d.ts.map +1 -1
- package/dist/client-application.js +13 -10
- package/dist/client-application.js.map +1 -1
- package/dist/daemon-command.d.ts.map +1 -1
- package/dist/daemon-command.js +7 -1
- package/dist/daemon-command.js.map +1 -1
- package/dist/headless.d.ts.map +1 -1
- package/dist/headless.js +7 -1
- package/dist/headless.js.map +1 -1
- package/dist/process-restart.d.ts +4 -0
- package/dist/process-restart.d.ts.map +1 -1
- package/dist/process-restart.js +33 -3
- package/dist/process-restart.js.map +1 -1
- package/dist/tui/commands.d.ts +1 -1
- package/dist/tui/commands.d.ts.map +1 -1
- package/dist/tui/controller.d.ts +1 -1
- package/dist/tui/controller.d.ts.map +1 -1
- package/dist/tui/controller.js +4 -0
- package/dist/tui/controller.js.map +1 -1
- package/dist/tui/run.d.ts.map +1 -1
- package/dist/tui/run.js +4 -1
- package/dist/tui/run.js.map +1 -1
- package/npm-shrinkwrap.json +23 -23
- package/package.json +12 -12
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-application.d.ts","sourceRoot":"","sources":["../src/client-application.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE9E,OAAO,EAAwB,KAAK,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACnF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEtD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAK5D,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"client-application.d.ts","sourceRoot":"","sources":["../src/client-application.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE9E,OAAO,EAAwB,KAAK,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACnF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEtD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,6BAA6B,CAAC;AAE9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAK5D,OAAO,EAA6B,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtF,MAAM,WAAW,qBAAsB,SAAQ,IAAI,CAAC,iBAAiB,EAAE,KAAK,GAAG,YAAY,CAAC;IAC1F,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACnC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,sIAAsI;IACtI,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAChC,YAAY,CAAC,EAAE,OAAO,CAAC;SAAG,CAAC,IAAI,MAAM,0BAA0B,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC;KAAE,CAAC,CAAC;IAC5G,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAA8E;AAEzH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,qBAAqB,GAAG,YAAY,CAM/E;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,qBAAqB,GAAG,MAAM,CAE9E;AAED,2FAA2F;AAC3F,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,qBAAqB,EAAE,eAAe,GAAG,YAAY,CAAC,GAAG,MAAM,CAG3H;AAWD,qFAAqF;AACrF,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,qBAAqB,GAAG,MAAM,CAEzE;AAED,wBAAsB,cAAc,CAAC,OAAO,GAAE,qBAA0B,EAAE,YAAY,GAAE;IACtF,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,aAAa,CAAC;IAChE,WAAW,CAAC,EAAE,OAAO,iBAAiB,CAAC;IACvC,WAAW,CAAC,EAAE,OAAO,iBAAiB,CAAC;IACvC,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC,GAAG,OAAO,CAAC,IAAI,CAAC,CA0ErB"}
|
|
@@ -10,6 +10,7 @@ import { hostBlockedRejection } from './client/daemon-blocked.js';
|
|
|
10
10
|
import { clientDiagnosticsLog } from './client/diagnostics.js';
|
|
11
11
|
import { TERMINAL_INTERACTION_KINDS, TERMINAL_UI_CAPABILITIES } from './tui/interactions.js';
|
|
12
12
|
import { createHerdrPane } from './tui/herdr.js';
|
|
13
|
+
import { takeRestartDaemonIdentity } from './process-restart.js';
|
|
13
14
|
export function getClientAgentDir() { return resolve(process.env.FELAN_AGENT_DIR ?? join(homedir(), '.felan')); }
|
|
14
15
|
export function clientDaemonTarget(options) {
|
|
15
16
|
if (options.daemonRuntime) {
|
|
@@ -40,7 +41,7 @@ export function clientLogDirectory(options) {
|
|
|
40
41
|
}
|
|
41
42
|
export async function runDaemonFelan(options = {}, dependencies = {}) {
|
|
42
43
|
const { DAEMON_VERSION } = await import('@felan-ai/daemon/version');
|
|
43
|
-
let replacing;
|
|
44
|
+
let replacing = takeRestartDaemonIdentity();
|
|
44
45
|
let selected = options.sessionId;
|
|
45
46
|
let cwd = resolve(options.cwd ?? process.cwd());
|
|
46
47
|
let draft = '';
|
|
@@ -70,6 +71,8 @@ export async function runDaemonFelan(options = {}, dependencies = {}) {
|
|
|
70
71
|
const identity = client.identity;
|
|
71
72
|
if (!identity)
|
|
72
73
|
throw new Error('Connect to a verified daemon before using lifecycle controls.');
|
|
74
|
+
const sessionId = controller.sessionId ?? selected;
|
|
75
|
+
const sessionCwd = controller.snapshot?.cwd ?? cwd;
|
|
73
76
|
const result = await client.control(action === 'stop' ? 'host.stop' : 'host.restart', force ? 'force' : 'drain');
|
|
74
77
|
const recovery = { client: 'tui', action: action === 'stop' ? 'stop' : 'restart' };
|
|
75
78
|
if (result.outcome !== 'accepted')
|
|
@@ -80,20 +83,18 @@ export async function runDaemonFelan(options = {}, dependencies = {}) {
|
|
|
80
83
|
if (inPlace)
|
|
81
84
|
controller.setNotice('Daemon restarting…');
|
|
82
85
|
await (dependencies.waitForStop ?? waitForDaemonStop)(client, options.signal, recovery);
|
|
86
|
+
if (action === 'relaunch') {
|
|
87
|
+
outcome.relaunch = { identity, ...(sessionId ? { sessionId } : {}), cwd: sessionCwd };
|
|
88
|
+
controller.setNotice('Restarting Felan Code…');
|
|
89
|
+
return true;
|
|
90
|
+
}
|
|
83
91
|
if (inPlace) {
|
|
84
92
|
await controller.reconnect({ replacing: identity });
|
|
85
|
-
if (action === 'relaunch') {
|
|
86
|
-
const sessionId = controller.sessionId ?? selected;
|
|
87
|
-
outcome.relaunch = { ...(sessionId ? { sessionId } : {}), cwd: controller.snapshot?.cwd ?? cwd };
|
|
88
|
-
controller.setNotice('Restarting Felan Code…');
|
|
89
|
-
return true;
|
|
90
|
-
}
|
|
91
93
|
controller.setNotice('Daemon restarted');
|
|
92
94
|
return false;
|
|
93
95
|
}
|
|
94
96
|
if (action === 'restart') {
|
|
95
|
-
|
|
96
|
-
outcome.restart = { identity, ...(sessionId ? { sessionId } : {}), cwd: controller.snapshot?.cwd ?? cwd,
|
|
97
|
+
outcome.restart = { identity, ...(sessionId ? { sessionId } : {}), cwd: sessionCwd,
|
|
97
98
|
draft: /^\/(?:daemon|restart)(?:\s|$)/u.test(text.trim()) ? '' : text, keepStartup: beforeAttachment === true && first };
|
|
98
99
|
}
|
|
99
100
|
return true;
|
|
@@ -107,7 +108,9 @@ export async function runDaemonFelan(options = {}, dependencies = {}) {
|
|
|
107
108
|
}
|
|
108
109
|
if (outcome.relaunch) {
|
|
109
110
|
const restart = dependencies.restartProcess ?? (await import('./process-restart.js')).restartFelanProcess;
|
|
110
|
-
|
|
111
|
+
const { identity, ...resume } = outcome.relaunch;
|
|
112
|
+
await restart({ ...resume, replacing: identity,
|
|
113
|
+
...(options.restartArgs ? { restartArgs: options.restartArgs } : {}) });
|
|
111
114
|
return;
|
|
112
115
|
}
|
|
113
116
|
const restart = outcome.restart;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-application.js","sourceRoot":"","sources":["../src/client-application.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,EAAE,aAAa,EAA6B,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,4BAA4B,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AACxG,OAAO,EAAE,oBAAoB,EAA0B,MAAM,qBAAqB,CAAC;AAEnF,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAG7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC/D,OAAO,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAC7F,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"client-application.js","sourceRoot":"","sources":["../src/client-application.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon-command.d.ts","sourceRoot":"","sources":["../src/daemon-command.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"daemon-command.d.ts","sourceRoot":"","sources":["../src/daemon-command.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAY7D,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,EAAE,EAAE;IAAE,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EAAE,YAAY,GAAE;IACrJ,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,aAAa,CAAC;IAChE,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,kBAAkB,CAAC,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CAC5E,GAAG,OAAO,CAAC,MAAM,CAAC,CAuFvB"}
|
package/dist/daemon-command.js
CHANGED
|
@@ -8,6 +8,7 @@ import { DAEMON_VERSION } from '@felan-ai/daemon';
|
|
|
8
8
|
import { waitForDaemonStop } from './client/daemon-stop.js';
|
|
9
9
|
import { formatHostBlocked, hostBlockedRejection } from './client/daemon-blocked.js';
|
|
10
10
|
import { DAEMON_COMMANDS, suggestCommand } from './cli-command-suggestions.js';
|
|
11
|
+
import { formatDaemonBuildMismatch } from './client/build-mismatch.js';
|
|
11
12
|
const usage = 'Usage: felan daemon [status|start|foreground|stop|restart|logs] [--daemon-runtime <dir>] [--host-config <path>] [--force]';
|
|
12
13
|
const absent = (error) => ['ENOENT', 'stale_endpoint', 'unavailable'].includes(error.code ?? '');
|
|
13
14
|
export async function runDaemonCommand(args, io, dependencies = {}) {
|
|
@@ -47,6 +48,9 @@ export async function runDaemonCommand(args, io, dependencies = {}) {
|
|
|
47
48
|
io.writeError(error.message);
|
|
48
49
|
return 1;
|
|
49
50
|
}
|
|
51
|
+
const quote = (value) => /^[\w\-./~:@]+$/u.test(value) ? value : `'${value.replaceAll("'", "'\\''")}'`;
|
|
52
|
+
const restartCommand = ['felan', 'daemon', 'restart', ...(daemonRuntime ? ['--daemon-runtime', quote(daemonRuntime)] : []),
|
|
53
|
+
...(hostConfigPath ? ['--host-config', quote(hostConfigPath)] : [])].join(' ');
|
|
50
54
|
const target = clientDaemonTarget(daemonRuntime ? { daemonRuntime } : {});
|
|
51
55
|
if (action === 'foreground')
|
|
52
56
|
return (dependencies.foreground ?? foreground)(target, hostConfigPath);
|
|
@@ -110,7 +114,7 @@ export async function runDaemonCommand(args, io, dependencies = {}) {
|
|
|
110
114
|
}
|
|
111
115
|
if (active.status === 'incompatible') {
|
|
112
116
|
const status = await active.control('host.status');
|
|
113
|
-
io.writeOutput(`Daemon ${status.daemonVersion}: ${status.state}.
|
|
117
|
+
io.writeOutput(`Daemon ${status.daemonVersion}: ${status.state}. Its protocol or provider configuration is incompatible with this installation; run ${restartCommand}.`);
|
|
114
118
|
if (status.state === 'blocked')
|
|
115
119
|
io.writeOutput(formatHostBlocked(status.blocked, { client: 'cli', ...(daemonRuntime ? { daemonRuntime } : {}) }));
|
|
116
120
|
return action === 'status' ? 0 : 1;
|
|
@@ -134,6 +138,8 @@ export async function runDaemonCommand(args, io, dependencies = {}) {
|
|
|
134
138
|
throw new Error('Daemon status is unavailable.');
|
|
135
139
|
const status = response.result;
|
|
136
140
|
io.writeOutput(`Daemon ${status.daemonVersion}: ${status.state}\nSessions: ${status.active.sessions}; runs: ${status.active.runs}; active tasks: ${status.active.work}; attachments: ${status.active.attachments}`);
|
|
141
|
+
if (active.buildMismatch)
|
|
142
|
+
io.writeOutput(formatDaemonBuildMismatch(active.buildMismatch, `Run ${restartCommand} to apply the new build.`));
|
|
137
143
|
if (status.state === 'blocked')
|
|
138
144
|
io.writeOutput(formatHostBlocked(status.blocked, { client: 'cli', ...(daemonRuntime ? { daemonRuntime } : {}) }));
|
|
139
145
|
for (const need of status.setupNeeds)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon-command.js","sourceRoot":"","sources":["../src/daemon-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,aAAa,EAA6B,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,4BAA4B,EAAE,gCAAgC,EAAE,MAAM,wBAAwB,CAAC;AACxG,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAuB,MAAM,4BAA4B,CAAC;AAC1G,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"daemon-command.js","sourceRoot":"","sources":["../src/daemon-command.ts"],"names":[],"mappings":"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"}
|
package/dist/headless.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headless.d.ts","sourceRoot":"","sources":["../src/headless.ts"],"names":[],"mappings":"AACA,OAAO,EAAkF,KAAK,eAAe,EAA0B,KAAK,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAChM,OAAO,
|
|
1
|
+
{"version":3,"file":"headless.d.ts","sourceRoot":"","sources":["../src/headless.ts"],"names":[],"mappings":"AACA,OAAO,EAAkF,KAAK,eAAe,EAA0B,KAAK,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAChM,OAAO,EAA4H,KAAK,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAI7L,MAAM,WAAW,4BAA6B,SAAQ,mBAAmB;IACvE,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,cAAc,CAAC,EAAE,OAAO,CAAC;IAClC,QAAQ,CAAC,aAAa,CAAC,EAAE,eAAe,CAAC,cAAc,CAAC,CAAC,UAAU,CAAC,CAAC;IACrE,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;IAC/B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC,iBAAiB,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC/D,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAC9B,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/D,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7C,QAAQ,CAAC,YAAY,CAAC,EAAE;QACtB,EAAE,CAAC,MAAM,EAAE,QAAQ,GAAG,SAAS,GAAG,QAAQ,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC;QAC3E,GAAG,CAAC,MAAM,EAAE,QAAQ,GAAG,SAAS,GAAG,QAAQ,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC;KAC7E,CAAC;CACH;AAED,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,4BAA4B,GAAG,OAAO,CAAC,MAAM,CAAC,CAyJlG;AAED,KAAK,YAAY,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;AAEjE,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,IAAI,CAAC,4BAA4B,EAAE,UAAU,GAAG,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG;IAAE,KAAK,EAAE,YAAY,CAAC;IAAC,QAAQ,CAAC,EAAE,eAAe,CAAC,UAAU,CAAC,CAAA;CAAE,CAoCxM;AAGD,qBAAa,kBAAkB;;IAOjB,QAAQ,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,KAAK,IAAI;IAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI;gBAA7G,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,KAAK,IAAI,EAAW,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI;IAElI,OAAO,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI;IAM5B,IAAI,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IASxB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAMtB,KAAK,IAAI,IAAI;IAOb,OAAO,CAAC,IAAI;CAkBb"}
|
package/dist/headless.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { resolve } from 'node:path';
|
|
2
2
|
import { ConfigValuesSchema, INTERACTION_KINDS, LIMITS, parseSchema, readMessageDisplay } from '@felan-ai/session-protocol';
|
|
3
|
-
import { accepted, createDaemonClient, readCurrentDaemonHistory, waitForDaemonAttachment, waitForDaemonRun } from './acp/daemon-session.js';
|
|
3
|
+
import { accepted, createDaemonClient, daemonRestartRecovery, readCurrentDaemonHistory, waitForDaemonAttachment, waitForDaemonRun } from './acp/daemon-session.js';
|
|
4
|
+
import { watchDaemonBuildMismatch } from './client/build-mismatch.js';
|
|
4
5
|
import { sanitizeAcpErrorMessage } from './acp/session-updates.js';
|
|
5
6
|
export async function runLocalFelanHeadless(options) {
|
|
6
7
|
const writeError = options.writeError ?? (line => process.stderr.write(`${line}\n`));
|
|
@@ -18,6 +19,7 @@ export async function runLocalFelanHeadless(options) {
|
|
|
18
19
|
let cancel;
|
|
19
20
|
let unsubscribe = () => { };
|
|
20
21
|
let unsubscribePresentation = () => { };
|
|
22
|
+
let stopBuildMismatchWatch = () => { };
|
|
21
23
|
let output;
|
|
22
24
|
let failOutput;
|
|
23
25
|
const outputFailure = new Promise((_resolve, reject) => { failOutput = reject; });
|
|
@@ -48,6 +50,8 @@ export async function runLocalFelanHeadless(options) {
|
|
|
48
50
|
const attachOptions = sessionDir ? { sessionDir } : undefined;
|
|
49
51
|
client = await createDaemonClient(options, 'headless', [...INTERACTION_KINDS]);
|
|
50
52
|
await client.connect();
|
|
53
|
+
if (options.mode === 'text')
|
|
54
|
+
stopBuildMismatchWatch = watchDaemonBuildMismatch(client, daemonRestartRecovery(options.daemonRuntime), writeError);
|
|
51
55
|
if (signalCode)
|
|
52
56
|
return signalCode;
|
|
53
57
|
session = options.sessionId;
|
|
@@ -94,6 +98,7 @@ export async function runLocalFelanHeadless(options) {
|
|
|
94
98
|
client.close();
|
|
95
99
|
client = await createDaemonClient(options, 'headless', [...INTERACTION_KINDS], ['native.events']);
|
|
96
100
|
await client.connect();
|
|
101
|
+
stopBuildMismatchWatch = watchDaemonBuildMismatch(client, daemonRestartRecovery(options.daemonRuntime), writeError);
|
|
97
102
|
if (!client.capabilities?.capabilities?.includes('native.events')) {
|
|
98
103
|
throw new Error('The daemon does not support native headless JSON output');
|
|
99
104
|
}
|
|
@@ -183,6 +188,7 @@ export async function runLocalFelanHeadless(options) {
|
|
|
183
188
|
finally {
|
|
184
189
|
unsubscribe();
|
|
185
190
|
unsubscribePresentation();
|
|
191
|
+
stopBuildMismatchWatch();
|
|
186
192
|
output?.close();
|
|
187
193
|
for (const [name, handler] of handlers)
|
|
188
194
|
signalSource.off(name, handler);
|
package/dist/headless.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"headless.js","sourceRoot":"","sources":["../src/headless.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"headless.js","sourceRoot":"","sources":["../src/headless.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,18 @@
|
|
|
1
1
|
import { spawn } from 'node:child_process';
|
|
2
|
+
import { type DaemonIdentity } from '@felan-ai/session-protocol';
|
|
2
3
|
interface RestartHandoff {
|
|
3
4
|
readonly type: 'felan-restart';
|
|
4
5
|
readonly sessionId?: string;
|
|
5
6
|
readonly cwd: string;
|
|
6
7
|
readonly restartArgs: readonly string[];
|
|
8
|
+
readonly replacing?: DaemonIdentity;
|
|
7
9
|
}
|
|
8
10
|
type SendToParent = (message: RestartHandoff, callback: (error: Error | null) => void) => boolean;
|
|
9
11
|
export interface RestartProcessOptions {
|
|
10
12
|
readonly sessionId?: string;
|
|
11
13
|
readonly cwd: string;
|
|
12
14
|
readonly restartArgs?: readonly string[];
|
|
15
|
+
readonly replacing?: DaemonIdentity;
|
|
13
16
|
readonly execve?: (file: string, args: readonly string[], env: NodeJS.ProcessEnv) => never;
|
|
14
17
|
readonly spawn?: typeof spawn;
|
|
15
18
|
readonly exit?: (code: number) => never;
|
|
@@ -18,6 +21,7 @@ export interface RestartProcessOptions {
|
|
|
18
21
|
readonly send?: SendToParent;
|
|
19
22
|
}
|
|
20
23
|
export type RestartProcess = (options: RestartProcessOptions) => Promise<never>;
|
|
24
|
+
export declare function takeRestartDaemonIdentity(env?: NodeJS.ProcessEnv): DaemonIdentity | undefined;
|
|
21
25
|
/** Replaces this client process with a fresh one that resumes the session; platforms without execve use a supervising parent. */
|
|
22
26
|
export declare function restartFelanProcess(options: RestartProcessOptions): Promise<never>;
|
|
23
27
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-restart.d.ts","sourceRoot":"","sources":["../src/process-restart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"process-restart.d.ts","sourceRoot":"","sources":["../src/process-restart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC3C,OAAO,EAAqC,KAAK,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAMpG,UAAU,cAAc;IACtB,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC;IAC/B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,WAAW,EAAE,SAAS,MAAM,EAAE,CAAC;IACxC,QAAQ,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC;CACrC;AAED,KAAK,YAAY,GAAG,CAAC,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,KAAK,IAAI,KAAK,OAAO,CAAC;AAElG,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,QAAQ,CAAC,SAAS,CAAC,EAAE,cAAc,CAAC;IACpC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,KAAK,KAAK,CAAC;IAC3F,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,KAAK,CAAC;IAC9B,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,KAAK,CAAC;IACxC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IACpC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACjC,QAAQ,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC;CAC9B;AAED,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,EAAE,qBAAqB,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC;AAEhF,wBAAgB,yBAAyB,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,cAAc,GAAG,SAAS,CAM1G;AAED,iIAAiI;AACjI,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,KAAK,CAAC,CAiCxF"}
|
package/dist/process-restart.js
CHANGED
|
@@ -1,17 +1,32 @@
|
|
|
1
1
|
import { spawn } from 'node:child_process';
|
|
2
|
+
import { DaemonIdentitySchema, parseSchema } from '@felan-ai/session-protocol';
|
|
2
3
|
const RESTART_WORKER_ENV = 'FELAN_RESTART_WORKER';
|
|
4
|
+
const RESTART_DAEMON_ENV = 'FELAN_RESTART_DAEMON';
|
|
3
5
|
const RESTART_EXIT_CODE = 75;
|
|
6
|
+
export function takeRestartDaemonIdentity(env = process.env) {
|
|
7
|
+
const identity = env[RESTART_DAEMON_ENV];
|
|
8
|
+
delete env[RESTART_DAEMON_ENV];
|
|
9
|
+
if (identity === undefined)
|
|
10
|
+
return;
|
|
11
|
+
try {
|
|
12
|
+
return parseSchema(DaemonIdentitySchema, JSON.parse(identity));
|
|
13
|
+
}
|
|
14
|
+
catch {
|
|
15
|
+
throw new Error('Invalid daemon restart handoff.');
|
|
16
|
+
}
|
|
17
|
+
}
|
|
4
18
|
/** Replaces this client process with a fresh one that resumes the session; platforms without execve use a supervising parent. */
|
|
5
19
|
export async function restartFelanProcess(options) {
|
|
6
20
|
const handoff = { type: 'felan-restart', ...(options.sessionId ? { sessionId: options.sessionId } : {}),
|
|
7
|
-
cwd: options.cwd, restartArgs: [...(options.restartArgs ?? [])]
|
|
21
|
+
cwd: options.cwd, restartArgs: [...(options.restartArgs ?? [])],
|
|
22
|
+
...(options.replacing ? { replacing: parseSchema(DaemonIdentitySchema, options.replacing) } : {}) };
|
|
8
23
|
const env = options.env ?? process.env;
|
|
9
24
|
const execve = options.execve ?? process.execve;
|
|
10
25
|
if ((options.platform ?? process.platform) !== 'win32' && execve !== undefined) {
|
|
11
26
|
const previousCwd = process.cwd();
|
|
12
27
|
try {
|
|
13
28
|
process.chdir(handoff.cwd);
|
|
14
|
-
return execve(process.execPath, [process.execPath, ...nodeArguments(handoff)], env);
|
|
29
|
+
return execve(process.execPath, [process.execPath, ...nodeArguments(handoff)], restartEnvironment(handoff, env));
|
|
15
30
|
}
|
|
16
31
|
catch (error) {
|
|
17
32
|
process.chdir(previousCwd);
|
|
@@ -43,9 +58,16 @@ function nodeArguments(handoff) {
|
|
|
43
58
|
throw new Error('Cannot restart Felan Code without a CLI entrypoint');
|
|
44
59
|
return [entrypoint, ...handoff.restartArgs, ...(handoff.sessionId ? ['--session', handoff.sessionId] : [])];
|
|
45
60
|
}
|
|
61
|
+
function restartEnvironment(handoff, env) {
|
|
62
|
+
const result = { ...env };
|
|
63
|
+
delete result[RESTART_DAEMON_ENV];
|
|
64
|
+
if (handoff.replacing)
|
|
65
|
+
result[RESTART_DAEMON_ENV] = JSON.stringify(handoff.replacing);
|
|
66
|
+
return result;
|
|
67
|
+
}
|
|
46
68
|
async function runRestartWorker(spawnProcess, handoff, env) {
|
|
47
69
|
const child = spawnProcess(process.execPath, nodeArguments(handoff), {
|
|
48
|
-
cwd: handoff.cwd, env: { ...env, [RESTART_WORKER_ENV]: '1' }, stdio: ['inherit', 'inherit', 'inherit', 'ipc'], windowsHide: false,
|
|
70
|
+
cwd: handoff.cwd, env: { ...restartEnvironment(handoff, env), [RESTART_WORKER_ENV]: '1' }, stdio: ['inherit', 'inherit', 'inherit', 'ipc'], windowsHide: false,
|
|
49
71
|
});
|
|
50
72
|
let requested;
|
|
51
73
|
child.on('message', (message) => { if (isRestartHandoff(message))
|
|
@@ -57,6 +79,14 @@ function isRestartHandoff(value) {
|
|
|
57
79
|
if (typeof value !== 'object' || value === null)
|
|
58
80
|
return false;
|
|
59
81
|
const handoff = value;
|
|
82
|
+
if (handoff.replacing !== undefined) {
|
|
83
|
+
try {
|
|
84
|
+
parseSchema(DaemonIdentitySchema, handoff.replacing);
|
|
85
|
+
}
|
|
86
|
+
catch {
|
|
87
|
+
return false;
|
|
88
|
+
}
|
|
89
|
+
}
|
|
60
90
|
return handoff.type === 'felan-restart'
|
|
61
91
|
&& (handoff.sessionId === undefined || typeof handoff.sessionId === 'string')
|
|
62
92
|
&& typeof handoff.cwd === 'string'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-restart.js","sourceRoot":"","sources":["../src/process-restart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"process-restart.js","sourceRoot":"","sources":["../src/process-restart.ts"],"names":[],"mappings":"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"}
|
package/dist/tui/commands.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { type AutocompleteProvider, type SlashCommand } from '@earendil-works/pi
|
|
|
2
2
|
import type { TuiSessionController } from './controller.js';
|
|
3
3
|
import type { Theme } from '@earendil-works/pi-coding-agent';
|
|
4
4
|
import type { NavigationDialogs } from './session-navigator.js';
|
|
5
|
-
/** `relaunch`
|
|
5
|
+
/** `relaunch` re-executes this client after daemon shutdown so the fresh installation starts its replacement. */
|
|
6
6
|
export type DaemonAction = 'stop' | 'restart' | 'relaunch';
|
|
7
7
|
export declare function tuiCommands(controller: TuiSessionController): SlashCommand[];
|
|
8
8
|
export declare function createCommandAutocomplete(controller: TuiSessionController, fallbackCwd?: string): AutocompleteProvider;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/tui/commands.ts"],"names":[],"mappings":"AACA,OAAO,EAAgC,KAAK,oBAAoB,EAAE,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEpH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAOhE,
|
|
1
|
+
{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/tui/commands.ts"],"names":[],"mappings":"AACA,OAAO,EAAgC,KAAK,oBAAoB,EAAE,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEpH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAOhE,iHAAiH;AACjH,MAAM,MAAM,YAAY,GAAG,MAAM,GAAG,SAAS,GAAG,UAAU,CAAC;AAkC3D,wBAAgB,WAAW,CAAC,UAAU,EAAE,oBAAoB,GAAG,YAAY,EAAE,CAK5E;AAED,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,oBAAoB,EAAE,WAAW,SAAgB,GAAG,oBAAoB,CAsB7H;AAED,wBAAsB,cAAc,CAAC,UAAU,EAAE,oBAAoB,EAAE,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,EAC7G,OAAO,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,IAAI,IAAI,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,KAAK,CAAC;IAAC,aAAa,CAAC,IAAI,IAAI,CAAC;IAAC,QAAQ,CAAC,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,WAAW,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAAC,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAAC,YAAY,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAAC,EAAE,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAAC,MAAM,CAAC,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CA+O5W"}
|
package/dist/tui/controller.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { type Message, type Operation, type OperationParams, type OperationResul
|
|
|
2
2
|
import type { DaemonIdentity } from '@felan-ai/session-protocol';
|
|
3
3
|
import type { SessionClient } from '../client/client.js';
|
|
4
4
|
import type { SessionListing } from './session-navigator.js';
|
|
5
|
-
type Connection = Pick<SessionClient, 'status' | 'reconnection' | 'incompatibleActiveWork' | 'identity' | 'capabilities' | 'connect' | 'request' | 'attach' | 'retryAttach' | 'detach' | 'readAttachment' | 'getInteractions' | 'subscribe' | 'close'>;
|
|
5
|
+
type Connection = Pick<SessionClient, 'status' | 'reconnection' | 'incompatibleActiveWork' | 'buildMismatch' | 'identity' | 'capabilities' | 'connect' | 'request' | 'attach' | 'retryAttach' | 'detach' | 'readAttachment' | 'getInteractions' | 'subscribe' | 'close'>;
|
|
6
6
|
type SessionSummary = OperationResult<'sessions.list'>['entries'][number];
|
|
7
7
|
/** A client-only line that scrolls with the transcript after its anchor entry, like Pi's chat status lines; never persisted. */
|
|
8
8
|
export interface TranscriptNote {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/tui/controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,eAAe,EAAE,KAAK,eAAe,EAAE,KAAK,WAAW,EAAE,KAAK,eAAe,EAAE,MAAM,4BAA4B,CAAC;AACtK,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAGzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAE7D,KAAK,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,QAAQ,GAAG,cAAc,GAAG,wBAAwB,GAAG,UAAU,GAAG,cAAc,GAAG,SAAS,GAAG,SAAS,GAAG,QAAQ,GAAG,aAAa,GAAG,QAAQ,GAAG,gBAAgB,GAAG,iBAAiB,GAAG,WAAW,GAAG,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../../src/tui/controller.ts"],"names":[],"mappings":"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"}
|
package/dist/tui/controller.js
CHANGED
|
@@ -561,6 +561,8 @@ export class TuiSessionController {
|
|
|
561
561
|
export function connectionText(client, now = Date.now()) {
|
|
562
562
|
if (client.status === 'ready')
|
|
563
563
|
return undefined;
|
|
564
|
+
if (client.status === 'incompatible')
|
|
565
|
+
return 'Daemon incompatible. Use /restart to restart with this installation.';
|
|
564
566
|
const retry = client.reconnection;
|
|
565
567
|
if (retry)
|
|
566
568
|
return `Daemon disconnected · reconnecting in ${Math.max(1, Math.ceil((retry.retryAt - now) / 1000))}s · /reconnect to retry now`;
|
|
@@ -569,6 +571,8 @@ export function connectionText(client, now = Date.now()) {
|
|
|
569
571
|
return `Daemon ${client.status}. Use /reconnect to retry.`;
|
|
570
572
|
}
|
|
571
573
|
function unavailableText(client) {
|
|
574
|
+
if (client.status === 'incompatible')
|
|
575
|
+
return 'Daemon incompatible. Use /restart to restart with this installation.';
|
|
572
576
|
return client.reconnection || client.status === 'connecting' ? 'Daemon disconnected; reconnecting automatically. Use /reconnect to retry now.'
|
|
573
577
|
: `Daemon ${client.status}. Use /reconnect to retry.`;
|
|
574
578
|
}
|