@agentuity/cli 0.1.41 → 0.1.43
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/agent-detection.d.ts.map +1 -1
- package/dist/agent-detection.js +8 -2
- package/dist/agent-detection.js.map +1 -1
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +9 -5
- package/dist/cli.js.map +1 -1
- package/dist/cmd/ai/index.d.ts.map +1 -1
- package/dist/cmd/ai/index.js +1 -8
- package/dist/cmd/ai/index.js.map +1 -1
- package/dist/cmd/ai/prompt/version.js +1 -1
- package/dist/cmd/ai/prompt/version.js.map +1 -1
- package/dist/cmd/auth/api.d.ts.map +1 -1
- package/dist/cmd/auth/api.js +4 -1
- package/dist/cmd/auth/api.js.map +1 -1
- package/dist/cmd/auth/ssh/api.js +2 -2
- package/dist/cmd/auth/ssh/api.js.map +1 -1
- package/dist/cmd/build/ast.d.ts.map +1 -1
- package/dist/cmd/build/ast.js +14 -13
- package/dist/cmd/build/ast.js.map +1 -1
- package/dist/cmd/build/entry-generator.d.ts.map +1 -1
- package/dist/cmd/build/entry-generator.js +137 -1
- package/dist/cmd/build/entry-generator.js.map +1 -1
- package/dist/cmd/build/patch/index.d.ts.map +1 -1
- package/dist/cmd/build/patch/index.js +3 -0
- package/dist/cmd/build/patch/index.js.map +1 -1
- package/dist/cmd/build/vite/index.d.ts +1 -0
- package/dist/cmd/build/vite/index.d.ts.map +1 -1
- package/dist/cmd/build/vite/index.js +1 -0
- package/dist/cmd/build/vite/index.js.map +1 -1
- package/dist/cmd/build/vite/metadata-generator.d.ts.map +1 -1
- package/dist/cmd/build/vite/metadata-generator.js +19 -9
- package/dist/cmd/build/vite/metadata-generator.js.map +1 -1
- package/dist/cmd/build/vite/public-asset-path-plugin.d.ts +46 -0
- package/dist/cmd/build/vite/public-asset-path-plugin.d.ts.map +1 -0
- package/dist/cmd/build/vite/public-asset-path-plugin.js +133 -0
- package/dist/cmd/build/vite/public-asset-path-plugin.js.map +1 -0
- package/dist/cmd/build/vite/registry-generator.d.ts.map +1 -1
- package/dist/cmd/build/vite/registry-generator.js +14 -5
- package/dist/cmd/build/vite/registry-generator.js.map +1 -1
- package/dist/cmd/build/vite/route-discovery.js +1 -1
- package/dist/cmd/build/vite/route-discovery.js.map +1 -1
- package/dist/cmd/build/vite/vite-asset-server-config.d.ts.map +1 -1
- package/dist/cmd/build/vite/vite-asset-server-config.js +17 -7
- package/dist/cmd/build/vite/vite-asset-server-config.js.map +1 -1
- package/dist/cmd/build/vite/vite-asset-server.d.ts.map +1 -1
- package/dist/cmd/build/vite/vite-asset-server.js +1 -1
- package/dist/cmd/build/vite/vite-asset-server.js.map +1 -1
- package/dist/cmd/build/vite/vite-builder.d.ts.map +1 -1
- package/dist/cmd/build/vite/vite-builder.js +13 -9
- package/dist/cmd/build/vite/vite-builder.js.map +1 -1
- package/dist/cmd/canary/index.d.ts.map +1 -1
- package/dist/cmd/canary/index.js +9 -1
- package/dist/cmd/canary/index.js.map +1 -1
- package/dist/cmd/cloud/db/create.d.ts.map +1 -1
- package/dist/cmd/cloud/db/create.js +2 -2
- package/dist/cmd/cloud/db/create.js.map +1 -1
- package/dist/cmd/cloud/db/delete.d.ts.map +1 -1
- package/dist/cmd/cloud/db/delete.js +2 -2
- package/dist/cmd/cloud/db/delete.js.map +1 -1
- package/dist/cmd/cloud/env/import.d.ts.map +1 -1
- package/dist/cmd/cloud/env/import.js +4 -1
- package/dist/cmd/cloud/env/import.js.map +1 -1
- package/dist/cmd/cloud/env/list.d.ts.map +1 -1
- package/dist/cmd/cloud/env/list.js +4 -1
- package/dist/cmd/cloud/env/list.js.map +1 -1
- package/dist/cmd/cloud/env/push.d.ts.map +1 -1
- package/dist/cmd/cloud/env/push.js +4 -1
- package/dist/cmd/cloud/env/push.js.map +1 -1
- package/dist/cmd/cloud/region/index.js +1 -1
- package/dist/cmd/cloud/region/index.js.map +1 -1
- package/dist/cmd/cloud/sandbox/snapshot/build.d.ts.map +1 -1
- package/dist/cmd/cloud/sandbox/snapshot/build.js +22 -10
- package/dist/cmd/cloud/sandbox/snapshot/build.js.map +1 -1
- package/dist/cmd/cloud/sandbox/snapshot/get.d.ts.map +1 -1
- package/dist/cmd/cloud/sandbox/snapshot/get.js +12 -2
- package/dist/cmd/cloud/sandbox/snapshot/get.js.map +1 -1
- package/dist/cmd/cloud/storage/create.d.ts.map +1 -1
- package/dist/cmd/cloud/storage/create.js +2 -2
- package/dist/cmd/cloud/storage/create.js.map +1 -1
- package/dist/cmd/cloud/storage/delete.d.ts.map +1 -1
- package/dist/cmd/cloud/storage/delete.js +2 -2
- package/dist/cmd/cloud/storage/delete.js.map +1 -1
- package/dist/cmd/dev/download.d.ts.map +1 -1
- package/dist/cmd/dev/download.js +9 -2
- package/dist/cmd/dev/download.js.map +1 -1
- package/dist/cmd/dev/index.js +1 -1
- package/dist/cmd/dev/index.js.map +1 -1
- package/dist/cmd/git/account/add.d.ts.map +1 -1
- package/dist/cmd/git/account/add.js +4 -3
- package/dist/cmd/git/account/add.js.map +1 -1
- package/dist/cmd/git/link.js +2 -2
- package/dist/cmd/git/link.js.map +1 -1
- package/dist/cmd/git/list.d.ts.map +1 -1
- package/dist/cmd/git/list.js +3 -2
- package/dist/cmd/git/list.js.map +1 -1
- package/dist/cmd/project/auth/init.js +1 -1
- package/dist/cmd/project/auth/init.js.map +1 -1
- package/dist/cmd/project/auth/shared.d.ts.map +1 -1
- package/dist/cmd/project/auth/shared.js +8 -3
- package/dist/cmd/project/auth/shared.js.map +1 -1
- package/dist/cmd/project/delete.d.ts.map +1 -1
- package/dist/cmd/project/delete.js +3 -2
- package/dist/cmd/project/delete.js.map +1 -1
- package/dist/cmd/project/reconcile.d.ts.map +1 -1
- package/dist/cmd/project/reconcile.js +9 -5
- package/dist/cmd/project/reconcile.js.map +1 -1
- package/dist/cmd/project/template-flow.d.ts.map +1 -1
- package/dist/cmd/project/template-flow.js +15 -5
- package/dist/cmd/project/template-flow.js.map +1 -1
- package/dist/cmd/support/report.d.ts.map +1 -1
- package/dist/cmd/support/report.js +58 -23
- package/dist/cmd/support/report.js.map +1 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +3 -2
- package/dist/config.js.map +1 -1
- package/dist/domain.d.ts.map +1 -1
- package/dist/domain.js +4 -3
- package/dist/domain.js.map +1 -1
- package/dist/internal-logger.d.ts +7 -0
- package/dist/internal-logger.d.ts.map +1 -1
- package/dist/internal-logger.js +82 -27
- package/dist/internal-logger.js.map +1 -1
- package/dist/repl.d.ts.map +1 -1
- package/dist/repl.js +31 -14
- package/dist/repl.js.map +1 -1
- package/dist/schema-parser.d.ts.map +1 -1
- package/dist/schema-parser.js +4 -1
- package/dist/schema-parser.js.map +1 -1
- package/dist/sound.d.ts.map +1 -1
- package/dist/sound.js +2 -1
- package/dist/sound.js.map +1 -1
- package/dist/steps.d.ts.map +1 -1
- package/dist/steps.js +13 -6
- package/dist/steps.js.map +1 -1
- package/dist/terminal.js +2 -0
- package/dist/terminal.js.map +1 -1
- package/dist/tsc-output-parser.d.ts +3 -0
- package/dist/tsc-output-parser.d.ts.map +1 -1
- package/dist/tsc-output-parser.js +32 -9
- package/dist/tsc-output-parser.js.map +1 -1
- package/dist/tui/prompt.d.ts.map +1 -1
- package/dist/tui/prompt.js +6 -2
- package/dist/tui/prompt.js.map +1 -1
- package/dist/tui.d.ts.map +1 -1
- package/dist/tui.js +26 -15
- package/dist/tui.js.map +1 -1
- package/dist/typescript-errors.d.ts.map +1 -1
- package/dist/typescript-errors.js +5 -2
- package/dist/typescript-errors.js.map +1 -1
- package/dist/utils/date.d.ts.map +1 -1
- package/dist/utils/date.js +5 -1
- package/dist/utils/date.js.map +1 -1
- package/dist/utils/deps.d.ts.map +1 -1
- package/dist/utils/deps.js +5 -3
- package/dist/utils/deps.js.map +1 -1
- package/dist/utils/detectSubagent.js +1 -1
- package/dist/utils/detectSubagent.js.map +1 -1
- package/package.json +8 -7
- package/src/agent-detection.ts +9 -2
- package/src/cli.ts +9 -5
- package/src/cmd/ai/index.ts +1 -8
- package/src/cmd/ai/prompt/version.ts +1 -1
- package/src/cmd/auth/api.ts +4 -1
- package/src/cmd/auth/ssh/api.ts +2 -2
- package/src/cmd/build/ast.ts +14 -13
- package/src/cmd/build/entry-generator.ts +137 -1
- package/src/cmd/build/patch/index.ts +3 -0
- package/src/cmd/build/vite/index.ts +1 -0
- package/src/cmd/build/vite/metadata-generator.ts +20 -9
- package/src/cmd/build/vite/public-asset-path-plugin.ts +167 -0
- package/src/cmd/build/vite/registry-generator.ts +14 -5
- package/src/cmd/build/vite/route-discovery.ts +1 -1
- package/src/cmd/build/vite/vite-asset-server-config.ts +19 -9
- package/src/cmd/build/vite/vite-asset-server.ts +3 -1
- package/src/cmd/build/vite/vite-builder.ts +22 -18
- package/src/cmd/canary/index.ts +9 -1
- package/src/cmd/cloud/db/create.ts +16 -17
- package/src/cmd/cloud/db/delete.ts +19 -20
- package/src/cmd/cloud/env/import.ts +6 -3
- package/src/cmd/cloud/env/list.ts +11 -9
- package/src/cmd/cloud/env/push.ts +6 -3
- package/src/cmd/cloud/region/index.ts +3 -3
- package/src/cmd/cloud/sandbox/snapshot/build.ts +42 -33
- package/src/cmd/cloud/sandbox/snapshot/get.ts +21 -15
- package/src/cmd/cloud/storage/create.ts +16 -17
- package/src/cmd/cloud/storage/delete.ts +19 -20
- package/src/cmd/dev/download.ts +10 -2
- package/src/cmd/dev/index.ts +4 -4
- package/src/cmd/git/account/add.ts +5 -4
- package/src/cmd/git/link.ts +2 -2
- package/src/cmd/git/list.ts +7 -6
- package/src/cmd/project/auth/init.ts +6 -6
- package/src/cmd/project/auth/shared.ts +8 -3
- package/src/cmd/project/delete.ts +3 -2
- package/src/cmd/project/reconcile.ts +9 -5
- package/src/cmd/project/template-flow.ts +15 -5
- package/src/cmd/support/report.ts +82 -28
- package/src/config.ts +3 -2
- package/src/domain.ts +4 -3
- package/src/internal-logger.ts +91 -26
- package/src/repl.ts +27 -14
- package/src/schema-parser.ts +4 -1
- package/src/sound.ts +2 -1
- package/src/steps.ts +11 -6
- package/src/terminal.ts +2 -1
- package/src/tsc-output-parser.ts +61 -38
- package/src/tui/prompt.ts +6 -2
- package/src/tui.ts +26 -17
- package/src/typescript-errors.ts +5 -2
- package/src/utils/date.ts +5 -1
- package/src/utils/deps.ts +5 -3
- package/src/utils/detectSubagent.ts +1 -1
- package/dist/cmd/ai/cadence/index.d.ts +0 -3
- package/dist/cmd/ai/cadence/index.d.ts.map +0 -1
- package/dist/cmd/ai/cadence/index.js +0 -35
- package/dist/cmd/ai/cadence/index.js.map +0 -1
- package/dist/cmd/ai/cadence/list.d.ts +0 -3
- package/dist/cmd/ai/cadence/list.d.ts.map +0 -1
- package/dist/cmd/ai/cadence/list.js +0 -167
- package/dist/cmd/ai/cadence/list.js.map +0 -1
- package/dist/cmd/ai/cadence/pause.d.ts +0 -3
- package/dist/cmd/ai/cadence/pause.d.ts.map +0 -1
- package/dist/cmd/ai/cadence/pause.js +0 -103
- package/dist/cmd/ai/cadence/pause.js.map +0 -1
- package/dist/cmd/ai/cadence/resume.d.ts +0 -3
- package/dist/cmd/ai/cadence/resume.d.ts.map +0 -1
- package/dist/cmd/ai/cadence/resume.js +0 -106
- package/dist/cmd/ai/cadence/resume.js.map +0 -1
- package/dist/cmd/ai/cadence/status.d.ts +0 -3
- package/dist/cmd/ai/cadence/status.d.ts.map +0 -1
- package/dist/cmd/ai/cadence/status.js +0 -129
- package/dist/cmd/ai/cadence/status.js.map +0 -1
- package/dist/cmd/ai/cadence/stop.d.ts +0 -3
- package/dist/cmd/ai/cadence/stop.d.ts.map +0 -1
- package/dist/cmd/ai/cadence/stop.js +0 -107
- package/dist/cmd/ai/cadence/stop.js.map +0 -1
- package/dist/cmd/ai/cadence/util.d.ts +0 -44
- package/dist/cmd/ai/cadence/util.d.ts.map +0 -1
- package/dist/cmd/ai/cadence/util.js +0 -52
- package/dist/cmd/ai/cadence/util.js.map +0 -1
- package/src/cmd/ai/cadence/index.ts +0 -36
- package/src/cmd/ai/cadence/list.ts +0 -183
- package/src/cmd/ai/cadence/pause.ts +0 -119
- package/src/cmd/ai/cadence/resume.ts +0 -124
- package/src/cmd/ai/cadence/status.ts +0 -141
- package/src/cmd/ai/cadence/stop.ts +0 -124
- package/src/cmd/ai/cadence/util.ts +0 -86
package/dist/domain.js
CHANGED
|
@@ -28,8 +28,9 @@ async function fetchDNSRecord(name, type) {
|
|
|
28
28
|
});
|
|
29
29
|
if (res.ok) {
|
|
30
30
|
const result = (await res.json());
|
|
31
|
-
|
|
32
|
-
|
|
31
|
+
const firstAnswer = result?.Answer?.[0];
|
|
32
|
+
if (firstAnswer) {
|
|
33
|
+
return firstAnswer.data.replace(/\.$/, ''); // DNS records end with . so we remove that
|
|
33
34
|
}
|
|
34
35
|
}
|
|
35
36
|
return null;
|
|
@@ -47,7 +48,7 @@ const PRODUCTION_DNS = 'agentuity.run';
|
|
|
47
48
|
*/
|
|
48
49
|
export async function checkCustomDomainForDNS(projectId, domains, config) {
|
|
49
50
|
const suffix = config?.overrides?.api_url?.includes('agentuity.io') ? LOCAL_DNS : PRODUCTION_DNS;
|
|
50
|
-
const id = Bun.hash.xxHash64(projectId).toString(16);
|
|
51
|
+
const id = Bun.hash.xxHash64(projectId).toString(16).padStart(16, '0');
|
|
51
52
|
const proxy = `p${id}.${suffix}`;
|
|
52
53
|
return Promise.all(domains.map(async (domain) => {
|
|
53
54
|
try {
|
package/dist/domain.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"domain.js","sourceRoot":"","sources":["../src/domain.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAmC7B,MAAM,UAAU,eAAe,CAAC,CAAY;IAC3C,OAAO,eAAe,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;AAClD,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,CAAY;IACrC,OAAO,SAAS,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,KAAK,KAAK,IAAI,SAAS,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,KAAK,KAAK,CAAC;AACvF,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,CAAY;IACnC,OAAO,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,CAAY;IACrC,OAAO,SAAS,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,KAAK,IAAI,IAAI,CAAC,CAAC,OAAO,KAAK,IAAI,CAAC;AACnE,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,CAAY;IACrC,OAAO,CAAC,CAAC,OAAO,IAAI,IAAI,IAAI,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,eAAe,IAAI,CAAC,CAAC,CAAC;AAC7F,CAAC;AAED,MAAM,SAAS,GAAG,IAAI,CAAC;AAEvB,MAAM,eAAe,GAAG,eAAe,CACtC,iBAAiB,EACjB,8BAA8B,SAAS,IAAI,CAC3C,CAAC;AAQF,KAAK,UAAU,cAAc,CAAC,IAAY,EAAE,IAAY;IACvD,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;IACrC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACzB,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACzB,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,wCAAwC,MAAM,CAAC,QAAQ,EAAE,EAAE,EAAE;QACpF,OAAO,EAAE;YACR,MAAM,EAAE,sBAAsB;SAC9B;KACD,CAAC,CAAC;IACH,IAAI,GAAG,CAAC,EAAE,EAAE,CAAC;QACZ,MAAM,MAAM,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAa,CAAC;QAC9C,
|
|
1
|
+
{"version":3,"file":"domain.js","sourceRoot":"","sources":["../src/domain.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,7 @@ export declare class InternalLogger implements Logger {
|
|
|
19
19
|
private sessionDir;
|
|
20
20
|
private sessionFile;
|
|
21
21
|
private logsFile;
|
|
22
|
+
private bucket;
|
|
22
23
|
private initialized;
|
|
23
24
|
private disabled;
|
|
24
25
|
constructor(cliVersion: string, cliName: string);
|
|
@@ -70,8 +71,14 @@ export declare class InternalLogger implements Logger {
|
|
|
70
71
|
* Create a new internal logger instance
|
|
71
72
|
*/
|
|
72
73
|
export declare function createInternalLogger(cliVersion: string, cliName: string): InternalLogger;
|
|
74
|
+
/**
|
|
75
|
+
* Get all log session directories in the current time window
|
|
76
|
+
* Returns directories from current bucket AND previous bucket (to handle boundary cases)
|
|
77
|
+
*/
|
|
78
|
+
export declare function getLogSessionsInCurrentWindow(): string[];
|
|
73
79
|
/**
|
|
74
80
|
* Get the latest log session directory (if any)
|
|
81
|
+
* For backward compatibility, returns the first session in the current window
|
|
75
82
|
*/
|
|
76
83
|
export declare function getLatestLogSession(): string | null;
|
|
77
84
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal-logger.d.ts","sourceRoot":"","sources":["../src/internal-logger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAaH,OAAO,KAAK,EAAE,MAAM,EAAY,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"internal-logger.d.ts","sourceRoot":"","sources":["../src/internal-logger.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAaH,OAAO,KAAK,EAAE,MAAM,EAAY,MAAM,iBAAiB,CAAC;AA2JxD;;GAEG;AACH,qBAAa,cAAe,YAAW,MAAM;IAU3C,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,OAAO;IAVhB,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,MAAM,CAAS;IACvB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,QAAQ,CAAS;gBAGhB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM;IAuBxB;;;;;;OAMG;IACH,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI;IAqFjF;;OAEG;IACH,OAAO,CAAC,QAAQ;IAoDhB,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAIjD,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAIjD,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAIhD,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAIhD,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI;IAIjD,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,KAAK;IAKlD,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM;IAK7C;;OAEG;IACH,YAAY,IAAI,MAAM;IAItB;;OAEG;IACH,aAAa,IAAI,MAAM;IAIvB;;OAEG;IACH,UAAU,IAAI,OAAO;IAIrB;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAe/B;;OAEG;IACH,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAerC;;OAEG;IACH,OAAO,IAAI,IAAI;CAGf;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,cAAc,CAExF;AAED;;;GAGG;AACH,wBAAgB,6BAA6B,IAAI,MAAM,EAAE,CAkCxD;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,MAAM,GAAG,IAAI,CAGnD;AAED;;GAEG;AACH,wBAAgB,cAAc,IAAI,MAAM,CAEvC"}
|
package/dist/internal-logger.js
CHANGED
|
@@ -63,9 +63,28 @@ function getLogsDir() {
|
|
|
63
63
|
return join(homedir(), '.config', 'agentuity', 'logs');
|
|
64
64
|
}
|
|
65
65
|
/**
|
|
66
|
-
*
|
|
66
|
+
* Calculate the current 5-minute bucket number
|
|
67
|
+
* Each bucket represents a 5-minute window (300000ms)
|
|
67
68
|
*/
|
|
68
|
-
function
|
|
69
|
+
function getCurrentBucket() {
|
|
70
|
+
return Math.floor(Date.now() / 300000);
|
|
71
|
+
}
|
|
72
|
+
/**
|
|
73
|
+
* Parse bucket number from directory name
|
|
74
|
+
* Directory format: {bucket}-{uuid}
|
|
75
|
+
* Returns null for legacy directories (uuid-only format)
|
|
76
|
+
*/
|
|
77
|
+
function parseBucketFromDirName(dirName) {
|
|
78
|
+
const match = dirName.match(/^(\d+)-/);
|
|
79
|
+
if (match && match[1]) {
|
|
80
|
+
return parseInt(match[1], 10);
|
|
81
|
+
}
|
|
82
|
+
return null;
|
|
83
|
+
}
|
|
84
|
+
/**
|
|
85
|
+
* Clean up old log directories, keeping only directories in the current bucket
|
|
86
|
+
*/
|
|
87
|
+
function cleanupOldLogs(currentBucket) {
|
|
69
88
|
// Skip cleanup when inheriting a parent's session ID to avoid
|
|
70
89
|
// deleting the parent's session directory (race condition).
|
|
71
90
|
// This applies to forked deploy processes and any subprocess
|
|
@@ -79,19 +98,23 @@ function cleanupOldLogs(currentSessionId) {
|
|
|
79
98
|
}
|
|
80
99
|
try {
|
|
81
100
|
const entries = readdirSync(logsDir, { withFileTypes: true });
|
|
82
|
-
const dirs = entries
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
.filter((name) => name !== currentSessionId);
|
|
86
|
-
// Remove all directories except the current one
|
|
101
|
+
const dirs = entries.filter((e) => e.isDirectory()).map((e) => e.name);
|
|
102
|
+
// Remove directories with bucket < currentBucket (old buckets)
|
|
103
|
+
// Also remove legacy directories (no bucket prefix) for backward compatibility
|
|
87
104
|
for (const dir of dirs) {
|
|
88
|
-
const
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
105
|
+
const bucket = parseBucketFromDirName(dir);
|
|
106
|
+
// Delete if:
|
|
107
|
+
// 1. Legacy directory (no bucket prefix) - clean up old format
|
|
108
|
+
// 2. Bucket is older than current bucket
|
|
109
|
+
if (bucket === null || bucket < currentBucket) {
|
|
110
|
+
const dirPath = join(logsDir, dir);
|
|
111
|
+
try {
|
|
112
|
+
rmSync(dirPath, { recursive: true, force: true });
|
|
113
|
+
}
|
|
114
|
+
catch (err) {
|
|
115
|
+
// Ignore errors during cleanup
|
|
116
|
+
console.debug(`Failed to remove old log directory ${dir}: ${err}`);
|
|
117
|
+
}
|
|
95
118
|
}
|
|
96
119
|
}
|
|
97
120
|
}
|
|
@@ -110,22 +133,29 @@ export class InternalLogger {
|
|
|
110
133
|
sessionDir;
|
|
111
134
|
sessionFile;
|
|
112
135
|
logsFile;
|
|
136
|
+
bucket;
|
|
113
137
|
initialized = false;
|
|
114
138
|
disabled = false;
|
|
115
139
|
constructor(cliVersion, cliName) {
|
|
116
140
|
this.cliVersion = cliVersion;
|
|
117
141
|
this.cliName = cliName;
|
|
142
|
+
// Calculate current 5-minute bucket
|
|
143
|
+
this.bucket = getCurrentBucket();
|
|
118
144
|
// When a parent session ID is set in the environment, use it to ensure
|
|
119
145
|
// all CLI invocations (parent and any subprocesses) write to the same log file.
|
|
120
146
|
// This prevents race conditions where child processes delete parent's logs.
|
|
121
147
|
const parentSessionId = process.env.AGENTUITY_INTERNAL_SESSION_ID;
|
|
122
148
|
if (parentSessionId) {
|
|
123
149
|
this.sessionId = parentSessionId;
|
|
150
|
+
// Parent session ID already includes bucket prefix, use as-is for directory name
|
|
151
|
+
this.sessionDir = join(getLogsDir(), parentSessionId);
|
|
124
152
|
}
|
|
125
153
|
else {
|
|
126
|
-
|
|
154
|
+
// Generate new session ID with bucket prefix: {bucket}-{uuid}
|
|
155
|
+
const uuid = randomUUID();
|
|
156
|
+
this.sessionId = `${this.bucket}-${uuid}`;
|
|
157
|
+
this.sessionDir = join(getLogsDir(), this.sessionId);
|
|
127
158
|
}
|
|
128
|
-
this.sessionDir = join(getLogsDir(), this.sessionId);
|
|
129
159
|
this.sessionFile = join(this.sessionDir, 'session.json');
|
|
130
160
|
this.logsFile = join(this.sessionDir, 'logs.jsonl');
|
|
131
161
|
}
|
|
@@ -142,9 +172,9 @@ export class InternalLogger {
|
|
|
142
172
|
try {
|
|
143
173
|
// Create logs directory (may already exist if we're a child process)
|
|
144
174
|
mkdirSync(this.sessionDir, { recursive: true, mode: 0o700 });
|
|
145
|
-
// Clean up old logs (
|
|
175
|
+
// Clean up old logs (directories with bucket < current bucket)
|
|
146
176
|
// This is skipped for child processes to avoid deleting parent's session
|
|
147
|
-
cleanupOldLogs(this.
|
|
177
|
+
cleanupOldLogs(this.bucket);
|
|
148
178
|
// When inheriting a parent's session ID, skip session.json creation
|
|
149
179
|
// (parent already created it) but enable logging
|
|
150
180
|
if (process.env.AGENTUITY_INTERNAL_SESSION_ID) {
|
|
@@ -178,6 +208,9 @@ export class InternalLogger {
|
|
|
178
208
|
// Gather session metadata
|
|
179
209
|
const sessionMetadata = {
|
|
180
210
|
sessionId: this.sessionId,
|
|
211
|
+
bucket: this.bucket,
|
|
212
|
+
pid: process.pid,
|
|
213
|
+
ppid: process.ppid,
|
|
181
214
|
command,
|
|
182
215
|
args,
|
|
183
216
|
timestamp: new Date().toISOString(),
|
|
@@ -352,26 +385,48 @@ export function createInternalLogger(cliVersion, cliName) {
|
|
|
352
385
|
return new InternalLogger(cliVersion, cliName);
|
|
353
386
|
}
|
|
354
387
|
/**
|
|
355
|
-
* Get
|
|
388
|
+
* Get all log session directories in the current time window
|
|
389
|
+
* Returns directories from current bucket AND previous bucket (to handle boundary cases)
|
|
356
390
|
*/
|
|
357
|
-
export function
|
|
391
|
+
export function getLogSessionsInCurrentWindow() {
|
|
358
392
|
const logsDir = getLogsDir();
|
|
359
393
|
if (!existsSync(logsDir)) {
|
|
360
|
-
return
|
|
394
|
+
return [];
|
|
361
395
|
}
|
|
362
396
|
try {
|
|
397
|
+
const currentBucket = getCurrentBucket();
|
|
398
|
+
const previousBucket = currentBucket - 1;
|
|
363
399
|
const entries = readdirSync(logsDir, { withFileTypes: true });
|
|
364
400
|
const dirs = entries.filter((e) => e.isDirectory()).map((e) => e.name);
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
401
|
+
// Filter to directories in current or previous bucket
|
|
402
|
+
const validDirs = dirs.filter((dir) => {
|
|
403
|
+
const bucket = parseBucketFromDirName(dir);
|
|
404
|
+
// Include current bucket, previous bucket, and legacy directories (for backward compat)
|
|
405
|
+
return bucket === currentBucket || bucket === previousBucket || bucket === null;
|
|
406
|
+
});
|
|
407
|
+
// Sort by bucket (descending) then by name to get most recent first
|
|
408
|
+
validDirs.sort((a, b) => {
|
|
409
|
+
const bucketA = parseBucketFromDirName(a) ?? 0;
|
|
410
|
+
const bucketB = parseBucketFromDirName(b) ?? 0;
|
|
411
|
+
if (bucketA !== bucketB) {
|
|
412
|
+
return bucketB - bucketA; // Higher bucket first
|
|
413
|
+
}
|
|
414
|
+
return b.localeCompare(a); // Then by name descending
|
|
415
|
+
});
|
|
416
|
+
return validDirs.map((dir) => join(logsDir, dir));
|
|
370
417
|
}
|
|
371
418
|
catch {
|
|
372
|
-
return
|
|
419
|
+
return [];
|
|
373
420
|
}
|
|
374
421
|
}
|
|
422
|
+
/**
|
|
423
|
+
* Get the latest log session directory (if any)
|
|
424
|
+
* For backward compatibility, returns the first session in the current window
|
|
425
|
+
*/
|
|
426
|
+
export function getLatestLogSession() {
|
|
427
|
+
const sessions = getLogSessionsInCurrentWindow();
|
|
428
|
+
return sessions[0] ?? null;
|
|
429
|
+
}
|
|
375
430
|
/**
|
|
376
431
|
* Get the logs directory path (exported for external use)
|
|
377
432
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"internal-logger.js","sourceRoot":"","sources":["../src/internal-logger.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"internal-logger.js","sourceRoot":"","sources":["../src/internal-logger.ts"],"names":[],"mappings":"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"}
|
package/dist/repl.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"repl.d.ts","sourceRoot":"","sources":["../src/repl.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"repl.d.ts","sourceRoot":"","sources":["../src/repl.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,GAAG,MAAM,OAAO,CAAC;AAI7B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB;;GAEG;AACH,MAAM,WAAW,aAAa;IAC7B,uBAAuB;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,qCAAqC;IACrC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,+CAA+C;IAC/C,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC;CAC1C;AAED;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC,WAAW,CAAC;AAE1C;;GAEG;AACH,MAAM,WAAW,WAAW;IAC3B,yBAAyB;IACzB,MAAM,EAAE,aAAa,CAAC;IACtB,qBAAqB;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,+BAA+B;IAC/B,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACjC,qCAAqC;IACrC,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACjC,uCAAuC;IACvC,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,oCAAoC;IACpC,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,uCAAuC;IACvC,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACnC,qCAAqC;IACrC,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACjC,2CAA2C;IAC3C,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACvC,0DAA0D;IAC1D,MAAM,EAAE,WAAW,CAAC;IACpB,oBAAoB;IACpB,IAAI,EAAE,MAAM,IAAI,CAAC;IACjB,2CAA2C;IAC3C,KAAK,EAAE,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,IAAI,CAAC;IACzE,mCAAmC;IACnC,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,CAC5B,GAAG,EAAE,WAAW,KACZ,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;AAElE;;GAEG;AACH,MAAM,WAAW,iBAAiB;IACjC,4CAA4C;IAC5C,IAAI,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IAChF,qCAAqC;IACrC,OAAO,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IACrC,8DAA8D;IAC9D,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC9B,sBAAsB;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,6BAA6B;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yBAAyB;IACzB,OAAO,EAAE,cAAc,CAAC;IACxB,kCAAkC;IAClC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,mDAAmD;IACnD,MAAM,CAAC,EAAE,iBAAiB,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC3B,mBAAmB;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,0CAA0C;IAC1C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yDAAyD;IACzD,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,+BAA+B;IAC/B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,mDAAmD;IACnD,MAAM,CAAC,EAAE,iBAAiB,CAAC;IAC3B,yCAAyC;IACzC,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;CAC/B;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IAC1B,kCAAkC;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uCAAuC;IACvC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iCAAiC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,2BAA2B;IAC3B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,sDAAsD;IACtD,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,8EAA8E;IAC9E,IAAI,CAAC,EAAE,MAAM,CAAC;CACd;AAsID;;GAEG;AACH,wBAAsB,UAAU,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAyUlE"}
|
package/dist/repl.js
CHANGED
|
@@ -65,6 +65,8 @@ function parseCommandLine(line) {
|
|
|
65
65
|
// Parse remaining tokens into args and options
|
|
66
66
|
for (let i = 1; i < tokens.length; i++) {
|
|
67
67
|
const token = tokens[i];
|
|
68
|
+
if (token === undefined)
|
|
69
|
+
continue;
|
|
68
70
|
if (token.startsWith('--')) {
|
|
69
71
|
// Long option: --name=value or --flag
|
|
70
72
|
const name = token.slice(2);
|
|
@@ -74,8 +76,9 @@ function parseCommandLine(line) {
|
|
|
74
76
|
}
|
|
75
77
|
else {
|
|
76
78
|
// Check if next token is a value
|
|
77
|
-
|
|
78
|
-
|
|
79
|
+
const nextToken = tokens[i + 1];
|
|
80
|
+
if (i + 1 < tokens.length && nextToken !== undefined && !nextToken.startsWith('-')) {
|
|
81
|
+
options[name] = nextToken;
|
|
79
82
|
i++;
|
|
80
83
|
}
|
|
81
84
|
else {
|
|
@@ -87,8 +90,9 @@ function parseCommandLine(line) {
|
|
|
87
90
|
// Short option: -f or -n value
|
|
88
91
|
const name = token.slice(1);
|
|
89
92
|
// Check if next token is a value
|
|
90
|
-
|
|
91
|
-
|
|
93
|
+
const nextToken = tokens[i + 1];
|
|
94
|
+
if (i + 1 < tokens.length && nextToken !== undefined && !nextToken.startsWith('-')) {
|
|
95
|
+
options[name] = nextToken;
|
|
92
96
|
i++;
|
|
93
97
|
}
|
|
94
98
|
else {
|
|
@@ -410,7 +414,7 @@ function getAutocompleteMatches(buffer, commands, commandMap) {
|
|
|
410
414
|
if (!buffer.trim())
|
|
411
415
|
return [];
|
|
412
416
|
const tokens = buffer.trim().split(/\s+/);
|
|
413
|
-
const firstToken = tokens[0]
|
|
417
|
+
const firstToken = tokens[0]?.toLowerCase() ?? '';
|
|
414
418
|
// If we're typing the first word (no trailing space), suggest commands
|
|
415
419
|
if (tokens.length === 1 && buffer === buffer.trimEnd()) {
|
|
416
420
|
return commands.filter((cmd) => cmd.startsWith(firstToken) && cmd !== firstToken);
|
|
@@ -427,7 +431,7 @@ function getAutocompleteMatches(buffer, commands, commandMap) {
|
|
|
427
431
|
if (tokens.length === 2 && buffer === buffer.trimEnd() && commandMap) {
|
|
428
432
|
const cmd = commandMap.get(firstToken);
|
|
429
433
|
if (cmd?.subcommands) {
|
|
430
|
-
const subToken = tokens[1]
|
|
434
|
+
const subToken = tokens[1]?.toLowerCase() ?? '';
|
|
431
435
|
return cmd.subcommands
|
|
432
436
|
.filter((sub) => sub.name.startsWith(subToken) && sub.name !== subToken)
|
|
433
437
|
.map((sub) => sub.name);
|
|
@@ -444,8 +448,10 @@ function getAutocompleteSuggestion(buffer, commands, commandMap, cycleIndex = 0)
|
|
|
444
448
|
if (matches.length === 0)
|
|
445
449
|
return '';
|
|
446
450
|
const selectedMatch = matches[cycleIndex % matches.length];
|
|
451
|
+
if (selectedMatch === undefined)
|
|
452
|
+
return '';
|
|
447
453
|
const tokens = buffer.trim().split(/\s+/);
|
|
448
|
-
const firstToken = tokens[0]
|
|
454
|
+
const firstToken = tokens[0]?.toLowerCase() ?? '';
|
|
449
455
|
// Typing first word (command name)
|
|
450
456
|
if (tokens.length === 1 && buffer === buffer.trimEnd()) {
|
|
451
457
|
const cmd = commandMap.get(selectedMatch.toLowerCase());
|
|
@@ -467,7 +473,7 @@ function getAutocompleteSuggestion(buffer, commands, commandMap, cycleIndex = 0)
|
|
|
467
473
|
// Typing subcommand name
|
|
468
474
|
if (tokens.length === 2 && buffer === buffer.trimEnd()) {
|
|
469
475
|
const cmd = commandMap.get(firstToken);
|
|
470
|
-
const subToken = tokens[1];
|
|
476
|
+
const subToken = tokens[1] ?? '';
|
|
471
477
|
const subcommand = cmd?.subcommands?.find((sub) => sub.name === selectedMatch);
|
|
472
478
|
let suggestion = selectedMatch.slice(subToken.length);
|
|
473
479
|
// Add argument placeholders for subcommand
|
|
@@ -565,7 +571,7 @@ class ActivityIndicator {
|
|
|
565
571
|
}, 80);
|
|
566
572
|
}
|
|
567
573
|
draw() {
|
|
568
|
-
const frame = this.frames[this.currentFrame];
|
|
574
|
+
const frame = this.frames[this.currentFrame] ?? this.frames[0] ?? '⠋';
|
|
569
575
|
// Clear line, draw spinner, stay on same line
|
|
570
576
|
process.stdout.write('\r\x1b[K'); // Clear line from cursor
|
|
571
577
|
process.stdout.write(`${tui.muted(frame)} ${tui.muted(this.message)}...`);
|
|
@@ -612,6 +618,8 @@ async function showCommandPicker(commandMap, prompt) {
|
|
|
612
618
|
// Draw commands
|
|
613
619
|
for (let i = 0; i < commands.length; i++) {
|
|
614
620
|
const cmd = commands[i];
|
|
621
|
+
if (cmd === undefined)
|
|
622
|
+
continue;
|
|
615
623
|
const isSelected = i === selectedIndex;
|
|
616
624
|
const prefix = isSelected ? '▶ ' : ' ';
|
|
617
625
|
const style = isSelected ? '\x1b[7m' : ''; // Reverse video for selected
|
|
@@ -660,7 +668,12 @@ async function showCommandPicker(commandMap, prompt) {
|
|
|
660
668
|
const selected = commands[selectedIndex];
|
|
661
669
|
cleanup();
|
|
662
670
|
clearPicker();
|
|
663
|
-
|
|
671
|
+
if (selected) {
|
|
672
|
+
resolve(selected.name + (selected.argHint ? ' ' : ''));
|
|
673
|
+
}
|
|
674
|
+
else {
|
|
675
|
+
resolve(null);
|
|
676
|
+
}
|
|
664
677
|
return;
|
|
665
678
|
}
|
|
666
679
|
// Arrow keys
|
|
@@ -698,6 +711,8 @@ function applySyntaxHighlighting(buffer, commands) {
|
|
|
698
711
|
let isFirstToken = true;
|
|
699
712
|
for (let i = 0; i < tokens.length; i++) {
|
|
700
713
|
const token = tokens[i];
|
|
714
|
+
if (token === undefined)
|
|
715
|
+
continue;
|
|
701
716
|
// Skip whitespace
|
|
702
717
|
if (/^\s+$/.test(token)) {
|
|
703
718
|
result += token;
|
|
@@ -746,7 +761,8 @@ async function readLine(history, startIndex, prompt = '', commands = [], command
|
|
|
746
761
|
let currentLineIndex = 0;
|
|
747
762
|
const searchHistory = (query, startFrom) => {
|
|
748
763
|
for (let i = startFrom - 1; i >= 0; i--) {
|
|
749
|
-
|
|
764
|
+
const historyEntry = history[i];
|
|
765
|
+
if (historyEntry !== undefined && historyEntry.toLowerCase().includes(query.toLowerCase())) {
|
|
750
766
|
return i;
|
|
751
767
|
}
|
|
752
768
|
}
|
|
@@ -783,7 +799,8 @@ async function readLine(history, startIndex, prompt = '', commands = [], command
|
|
|
783
799
|
}
|
|
784
800
|
const linePrompt = currentLineIndex === 0 ? prompt : '... ';
|
|
785
801
|
process.stdout.write('\r');
|
|
786
|
-
|
|
802
|
+
const currentLine = lines[currentLineIndex] ?? '';
|
|
803
|
+
process.stdout.write(linePrompt + currentLine.slice(0, cursorPos));
|
|
787
804
|
}
|
|
788
805
|
else {
|
|
789
806
|
// Single-line mode (original behavior)
|
|
@@ -977,7 +994,7 @@ async function readLine(history, startIndex, prompt = '', commands = [], command
|
|
|
977
994
|
lines.push('');
|
|
978
995
|
currentLineIndex++;
|
|
979
996
|
cursorPos = 0;
|
|
980
|
-
buffer = lines[currentLineIndex];
|
|
997
|
+
buffer = lines[currentLineIndex] ?? '';
|
|
981
998
|
process.stdout.write('\n');
|
|
982
999
|
process.stdout.write('... ');
|
|
983
1000
|
return;
|
|
@@ -987,7 +1004,7 @@ async function readLine(history, startIndex, prompt = '', commands = [], command
|
|
|
987
1004
|
if (searchMode) {
|
|
988
1005
|
// Accept search result
|
|
989
1006
|
if (searchResultIndex >= 0) {
|
|
990
|
-
buffer = history[searchResultIndex];
|
|
1007
|
+
buffer = history[searchResultIndex] ?? '';
|
|
991
1008
|
}
|
|
992
1009
|
searchMode = false;
|
|
993
1010
|
process.stdout.write('\n');
|