@undefineds.co/linx 0.3.27 → 0.3.28
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/lib/linx-interactive-post-init.js +1 -1
- package/dist/lib/linx-interactive-post-init.js.map +1 -1
- package/dist/lib/linx-interrupt-control.js +21 -1
- package/dist/lib/linx-interrupt-control.js.map +1 -1
- package/dist/lib/linx-session-work-control.js +28 -4
- package/dist/lib/linx-session-work-control.js.map +1 -1
- package/dist/lib/linx-update-notification.js +38 -5
- package/dist/lib/linx-update-notification.js.map +1 -1
- package/dist/lib/shell-lifecycle.js +21 -1
- package/dist/lib/shell-lifecycle.js.map +1 -1
- package/dist/plugins/linx-symphony-codex/.codex-plugin/plugin.json +1 -1
- package/package.json +1 -1
|
@@ -53,7 +53,7 @@ function installPostInitInteractiveControls(interactive, runtime, sessionCwd, op
|
|
|
53
53
|
export function installLinxEscapeInterrupt(interactive) {
|
|
54
54
|
installLinxInterruptControl(interactive, {
|
|
55
55
|
disableAutoMode(target) {
|
|
56
|
-
|
|
56
|
+
return handleInteractiveAutoCommand(target, getLinxInteractiveRuntime(target), false);
|
|
57
57
|
},
|
|
58
58
|
});
|
|
59
59
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linx-interactive-post-init.js","sourceRoot":"","sources":["../../src/lib/linx-interactive-post-init.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"linx-interactive-post-init.js","sourceRoot":"","sources":["../../src/lib/linx-interactive-post-init.ts"],"names":[],"mappings":"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"}
|
|
@@ -90,7 +90,27 @@ function handBackAutoControlOnInterrupt(interactive, options) {
|
|
|
90
90
|
return false;
|
|
91
91
|
}
|
|
92
92
|
stopLinxInteractiveSessionWorkNow(interactive);
|
|
93
|
-
|
|
93
|
+
disableAutoModeAfterInterrupt(interactive, options);
|
|
94
94
|
return true;
|
|
95
95
|
}
|
|
96
|
+
function disableAutoModeAfterInterrupt(interactive, options) {
|
|
97
|
+
if (typeof options.disableAutoMode !== 'function') {
|
|
98
|
+
return;
|
|
99
|
+
}
|
|
100
|
+
try {
|
|
101
|
+
const result = options.disableAutoMode(interactive);
|
|
102
|
+
if (result && typeof result.catch === 'function') {
|
|
103
|
+
void result.catch((error) => {
|
|
104
|
+
reportAutoHandoffError(interactive, error);
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
catch (error) {
|
|
109
|
+
reportAutoHandoffError(interactive, error);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
function reportAutoHandoffError(interactive, error) {
|
|
113
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
114
|
+
showLinxInteractiveError(interactive, `Auto mode handoff failed: ${message}`);
|
|
115
|
+
}
|
|
96
116
|
//# sourceMappingURL=linx-interrupt-control.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linx-interrupt-control.js","sourceRoot":"","sources":["../../src/lib/linx-interrupt-control.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"linx-interrupt-control.js","sourceRoot":"","sources":["../../src/lib/linx-interrupt-control.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { getSessionCommandRouterOriginalPrompt, getSessionCommandRouterOriginalSendUserMessage, } from './linx-session-command-routing-host.js';
|
|
2
2
|
import { restoreLinxSessionHistoryBranch } from './linx-session-history.js';
|
|
3
|
+
import { showLinxInteractiveError } from './linx-interactive-error-display.js';
|
|
3
4
|
export async function stopLinxActiveSessionWork(session, options = {}) {
|
|
4
5
|
if (!session) {
|
|
5
6
|
return;
|
|
@@ -7,10 +8,10 @@ export async function stopLinxActiveSessionWork(session, options = {}) {
|
|
|
7
8
|
const shouldWait = session.isStreaming === true || session.isBashRunning === true;
|
|
8
9
|
try {
|
|
9
10
|
if (session.isBashRunning === true && typeof session.abortBash === 'function') {
|
|
10
|
-
session.abortBash();
|
|
11
|
+
absorbLinxSessionAbortResult(session.abortBash());
|
|
11
12
|
}
|
|
12
13
|
if (session.isStreaming === true && typeof session.abort === 'function') {
|
|
13
|
-
session.abort();
|
|
14
|
+
absorbLinxSessionAbortResult(session.abort());
|
|
14
15
|
}
|
|
15
16
|
}
|
|
16
17
|
catch {
|
|
@@ -27,6 +28,12 @@ export async function stopLinxActiveSessionWork(session, options = {}) {
|
|
|
27
28
|
export async function stopLinxInteractiveSessionWork(interactive, runtime, options = {}) {
|
|
28
29
|
await stopLinxActiveSessionWork(interactive?.session ?? runtime?.session, options);
|
|
29
30
|
}
|
|
31
|
+
function absorbLinxSessionAbortResult(result) {
|
|
32
|
+
if (!isPromiseLike(result)) {
|
|
33
|
+
return;
|
|
34
|
+
}
|
|
35
|
+
void Promise.resolve(result).catch(() => undefined);
|
|
36
|
+
}
|
|
30
37
|
export async function submitLinxSessionUserInput(session, text, options = {}) {
|
|
31
38
|
const sendUserMessage = options.sendUserMessage ?? session?.sendUserMessage;
|
|
32
39
|
if (typeof sendUserMessage === 'function') {
|
|
@@ -113,15 +120,32 @@ export function canSubmitLinxInteractiveSessionUserInputNow(interactive) {
|
|
|
113
120
|
export function stopLinxInteractiveSessionWorkNow(interactive) {
|
|
114
121
|
const session = interactive?.session;
|
|
115
122
|
if (session?.isBashRunning === true && typeof session.abortBash === 'function') {
|
|
116
|
-
|
|
123
|
+
runLinxSessionInterrupt(interactive, () => session.abortBash());
|
|
117
124
|
return true;
|
|
118
125
|
}
|
|
119
126
|
if (isLinxInteractiveSessionWorkActive(interactive) && typeof session?.abort === 'function') {
|
|
120
|
-
|
|
127
|
+
runLinxSessionInterrupt(interactive, () => session.abort());
|
|
121
128
|
return true;
|
|
122
129
|
}
|
|
123
130
|
return false;
|
|
124
131
|
}
|
|
132
|
+
function runLinxSessionInterrupt(interactive, interrupt) {
|
|
133
|
+
try {
|
|
134
|
+
const result = interrupt();
|
|
135
|
+
if (isPromiseLike(result)) {
|
|
136
|
+
Promise.resolve(result).catch((error) => {
|
|
137
|
+
reportLinxSessionInterruptError(interactive, error);
|
|
138
|
+
});
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
catch (error) {
|
|
142
|
+
reportLinxSessionInterruptError(interactive, error);
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
function reportLinxSessionInterruptError(interactive, error) {
|
|
146
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
147
|
+
showLinxInteractiveError(interactive, `LinX session interrupt failed: ${message}`);
|
|
148
|
+
}
|
|
125
149
|
function isLinxSessionStreaming(session) {
|
|
126
150
|
return session?.isStreaming === true;
|
|
127
151
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linx-session-work-control.js","sourceRoot":"","sources":["../../src/lib/linx-session-work-control.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qCAAqC,EACrC,8CAA8C,GAC/C,MAAM,wCAAwC,CAAA;AAC/C,OAAO,EAAE,+BAA+B,EAA6B,MAAM,2BAA2B,CAAA;
|
|
1
|
+
{"version":3,"file":"linx-session-work-control.js","sourceRoot":"","sources":["../../src/lib/linx-session-work-control.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ import { registerLinxInteractiveRunHandler } from './linx-interactive-run-router
|
|
|
6
6
|
import { registerLinxInteractiveUpdateNotificationHandler, registerLinxInteractiveVersionCheckHandler, } from './linx-interactive-update-router.js';
|
|
7
7
|
import { appendLinxInteractiveChatText } from './linx-interactive-chat-text-host.js';
|
|
8
8
|
import { showLinxInteractiveStatus } from './linx-interactive-status-display.js';
|
|
9
|
+
import { showLinxInteractiveError } from './linx-interactive-error-display.js';
|
|
9
10
|
import { getLinxInteractiveUpdateState } from './linx-interactive-update-state-host.js';
|
|
10
11
|
const UPDATE_OPTION_INSTALL = 'Install update and restart';
|
|
11
12
|
const UPDATE_OPTION_CHANGELOG = 'Open changelog';
|
|
@@ -22,10 +23,13 @@ export async function checkAndShowLinxUpdate(interactive, options = {}) {
|
|
|
22
23
|
}
|
|
23
24
|
return;
|
|
24
25
|
}
|
|
25
|
-
requestLinxUpdateNotification(interactive, latest, {
|
|
26
|
+
const notification = requestLinxUpdateNotification(interactive, latest, {
|
|
26
27
|
...options,
|
|
27
28
|
force: options.manual === true,
|
|
28
29
|
});
|
|
30
|
+
if (options.manual === true) {
|
|
31
|
+
await notification;
|
|
32
|
+
}
|
|
29
33
|
}
|
|
30
34
|
export function replayDeferredLinxUpdateNotification(interactive, options = {}) {
|
|
31
35
|
const updateState = getLinxInteractiveUpdateState(interactive);
|
|
@@ -34,7 +38,7 @@ export function replayDeferredLinxUpdateNotification(interactive, options = {})
|
|
|
34
38
|
return;
|
|
35
39
|
}
|
|
36
40
|
updateState.deferredUpdateVersion = undefined;
|
|
37
|
-
|
|
41
|
+
startLinxUpdateSelectorInBackground(interactive, version);
|
|
38
42
|
}
|
|
39
43
|
function patchVersionCheck(interactive) {
|
|
40
44
|
installLinxUpstreamPiUpdateSuppression(interactive);
|
|
@@ -68,7 +72,7 @@ function patchUpdateNotification(interactive, options) {
|
|
|
68
72
|
if (!normalizedVersion) {
|
|
69
73
|
return true;
|
|
70
74
|
}
|
|
71
|
-
|
|
75
|
+
startLinxUpdateNotificationInBackground(target, normalizedVersion, options);
|
|
72
76
|
return true;
|
|
73
77
|
},
|
|
74
78
|
});
|
|
@@ -85,7 +89,7 @@ export function scheduleLinxVersionCheckAfterInit(interactive, options = {}) {
|
|
|
85
89
|
if (!latest) {
|
|
86
90
|
return;
|
|
87
91
|
}
|
|
88
|
-
|
|
92
|
+
startLinxUpdateNotificationInBackground(interactive, latest, options);
|
|
89
93
|
})
|
|
90
94
|
.catch(() => undefined);
|
|
91
95
|
});
|
|
@@ -133,7 +137,36 @@ function requestLinxUpdateNotification(interactive, newVersion, options = {}) {
|
|
|
133
137
|
return;
|
|
134
138
|
}
|
|
135
139
|
updateState.deferredUpdateVersion = undefined;
|
|
136
|
-
|
|
140
|
+
return showLinxUpdateSelector(interactive, newVersion);
|
|
141
|
+
}
|
|
142
|
+
function startLinxUpdateNotificationInBackground(interactive, newVersion, options = {}) {
|
|
143
|
+
try {
|
|
144
|
+
const result = requestLinxUpdateNotification(interactive, newVersion, options);
|
|
145
|
+
catchLinxBackgroundUpdateError(interactive, result);
|
|
146
|
+
}
|
|
147
|
+
catch (error) {
|
|
148
|
+
reportLinxBackgroundUpdateError(interactive, error);
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
function startLinxUpdateSelectorInBackground(interactive, newVersion) {
|
|
152
|
+
try {
|
|
153
|
+
catchLinxBackgroundUpdateError(interactive, showLinxUpdateSelector(interactive, newVersion));
|
|
154
|
+
}
|
|
155
|
+
catch (error) {
|
|
156
|
+
reportLinxBackgroundUpdateError(interactive, error);
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
function catchLinxBackgroundUpdateError(interactive, result) {
|
|
160
|
+
if (!result || typeof result.catch !== 'function') {
|
|
161
|
+
return;
|
|
162
|
+
}
|
|
163
|
+
void result.catch((error) => {
|
|
164
|
+
reportLinxBackgroundUpdateError(interactive, error);
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
function reportLinxBackgroundUpdateError(interactive, error) {
|
|
168
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
169
|
+
showLinxInteractiveError(interactive, `LinX update failed: ${message}`);
|
|
137
170
|
}
|
|
138
171
|
function shouldDeferLinxUpdateNotification(options) {
|
|
139
172
|
return options.shouldDefer?.() === true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linx-update-notification.js","sourceRoot":"","sources":["../../src/lib/linx-update-notification.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,+BAA+B,EAC/B,kBAAkB,EAClB,gBAAgB,EAChB,wBAAwB,GACzB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,EACL,+CAA+C,EAC/C,4CAA4C,GAC7C,MAAM,+CAA+C,CAAA;AACtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AACnE,OAAO,EAAE,iCAAiC,EAAE,MAAM,kCAAkC,CAAA;AACpF,OAAO,EACL,gDAAgD,EAChD,0CAA0C,GAC3C,MAAM,qCAAqC,CAAA;AAC5C,OAAO,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAA;AACpF,OAAO,EAAE,yBAAyB,EAAE,MAAM,sCAAsC,CAAA;AAChF,OAAO,EAAE,6BAA6B,EAAE,MAAM,yCAAyC,CAAA;AAEvF,MAAM,qBAAqB,GAAG,4BAA4B,CAAA;AAC1D,MAAM,uBAAuB,GAAG,gBAAgB,CAAA;AAChD,MAAM,mBAAmB,GAAG,OAAO,CAAA;AAMnC,MAAM,UAAU,6BAA6B,CAC3C,WAAgB,EAChB,UAAyC,EAAE;IAE3C,iBAAiB,CAAC,WAAW,CAAC,CAAA;IAC9B,uBAAuB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAA;AAC/C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,WAAgB,EAChB,UAAgE,EAAE;IAElE,MAAM,MAAM,GAAG,MAAM,sBAAsB,EAAE,CAAA;IAC7C,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,yBAAyB,CAAC,WAAW,EAAE,QAAQ,gBAAgB,iBAAiB,CAAC,CAAA;QACnF,CAAC;QACD,OAAM;IACR,CAAC;IAED,6BAA6B,CAAC,WAAW,EAAE,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"linx-update-notification.js","sourceRoot":"","sources":["../../src/lib/linx-update-notification.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { spawn } from 'node:child_process';
|
|
2
|
+
import { basename, dirname, join } from 'node:path';
|
|
2
3
|
import { showLinxInteractiveError } from './linx-interactive-error-display.js';
|
|
3
4
|
import { registerLinxInteractiveStopHandler } from './linx-interactive-stop-router.js';
|
|
4
5
|
export const LINX_TUI_NO_EXIT_MESSAGE_ENV = 'LINX_TUI_NO_EXIT_MESSAGE';
|
|
@@ -27,7 +28,7 @@ export function restartInteractiveShellProcess(interactive, options = {}) {
|
|
|
27
28
|
try {
|
|
28
29
|
runtime.defer(() => {
|
|
29
30
|
try {
|
|
30
|
-
const child = runtime.spawnProcess(runtime.execPath, runtime.argv
|
|
31
|
+
const child = runtime.spawnProcess(runtime.execPath, buildRestartArgv(runtime.argv), {
|
|
31
32
|
cwd: runtime.cwd(),
|
|
32
33
|
env: buildRestartChildEnv(runtime.env, suppression.previousNoExitMessage),
|
|
33
34
|
stdio: 'inherit',
|
|
@@ -134,6 +135,25 @@ function buildRestartChildEnv(env, previousNoExitMessage) {
|
|
|
134
135
|
}
|
|
135
136
|
return childEnv;
|
|
136
137
|
}
|
|
138
|
+
function buildRestartArgv(argv) {
|
|
139
|
+
const args = argv.slice(1);
|
|
140
|
+
const entry = args[0];
|
|
141
|
+
if (!entry || !isUpstreamPiExecutable(entry)) {
|
|
142
|
+
return args;
|
|
143
|
+
}
|
|
144
|
+
args[0] = replaceExecutableBasename(entry, basename(entry).replace(/^pi/i, 'linx'));
|
|
145
|
+
return args;
|
|
146
|
+
}
|
|
147
|
+
function isUpstreamPiExecutable(value) {
|
|
148
|
+
return /^pi(?:\.(?:js|cjs|mjs|cmd|ps1))?$/i.test(basename(value));
|
|
149
|
+
}
|
|
150
|
+
function replaceExecutableBasename(value, nextBaseName) {
|
|
151
|
+
const directory = dirname(value);
|
|
152
|
+
if (directory === '.' || directory === '') {
|
|
153
|
+
return nextBaseName;
|
|
154
|
+
}
|
|
155
|
+
return join(directory, nextBaseName);
|
|
156
|
+
}
|
|
137
157
|
function waitForRestartedProcess(interactive, child, runtime, restoreEnv, finishWithExit) {
|
|
138
158
|
let settled = false;
|
|
139
159
|
child.on('error', (error) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell-lifecycle.js","sourceRoot":"","sources":["../../src/lib/shell-lifecycle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAqB,MAAM,oBAAoB,CAAA;AAC7D,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAA;AAC9E,OAAO,EAAE,kCAAkC,EAAE,MAAM,mCAAmC,CAAA;AAEtF,MAAM,CAAC,MAAM,4BAA4B,GAAG,0BAA0B,CAAA;AACtE,MAAM,4BAA4B,GAAG,MAAM,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAA;AAC7E,MAAM,8BAA8B,GAAG,MAAM,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAA;AACjF,MAAM,oBAAoB,GAAG,IAAI,CAAA;AA6BjC,MAAM,wBAAwB,GAAG,EAAE,CAAA;AAEnC,MAAM,0BAA0B,GAAwB;IACtD,YAAY,EAAE,KAAK;IACnB,WAAW,EAAE,CAAC,IAAa,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC;IAClD,KAAK,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3D,GAAG,EAAE,OAAO,CAAC,GAAG;IAChB,QAAQ,EAAE,OAAO,CAAC,QAAQ;IAC1B,IAAI,EAAE,OAAO,CAAC,IAAI;IAClB,GAAG,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;CACzB,CAAA;AAED,MAAM,UAAU,8BAA8B,CAC5C,WAAsC,EACtC,UAA0C,EAAE;IAE5C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,0BAA0B,CAAA;IAC7D,MAAM,WAAW,GAAG,uBAAuB,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;IAErE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,MAAM,cAAc,GAAG,CAAC,IAAY,EAAQ,EAAE;YAC5C,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;YACzB,OAAO,EAAE,CAAA;QACX,CAAC,CAAA;QACD,MAAM,gBAAgB,GAAG,GAAS,EAAE;YAClC,IAAI,CAAC;gBACH,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;oBACjB,IAAI,CAAC;wBACH,MAAM,KAAK,GAAG,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"shell-lifecycle.js","sourceRoot":"","sources":["../../src/lib/shell-lifecycle.ts"],"names":[],"mappings":"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"}
|