@pentoshi/clai 4.7.0 → 4.8.1

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.
Files changed (124) hide show
  1. package/dist/agent/context-manager.js +13 -3
  2. package/dist/agent/context-manager.js.map +1 -1
  3. package/dist/agent/injected-blocks.d.ts +8 -0
  4. package/dist/agent/injected-blocks.js +26 -0
  5. package/dist/agent/injected-blocks.js.map +1 -0
  6. package/dist/agent/must-continue.js +13 -8
  7. package/dist/agent/must-continue.js.map +1 -1
  8. package/dist/agent/runner.js +94 -23
  9. package/dist/agent/runner.js.map +1 -1
  10. package/dist/agent/tool-call-parser.js +2 -1
  11. package/dist/agent/tool-call-parser.js.map +1 -1
  12. package/dist/agent/tool-history.js +8 -2
  13. package/dist/agent/tool-history.js.map +1 -1
  14. package/dist/app/commands/catalog.js +9 -1
  15. package/dist/app/commands/catalog.js.map +1 -1
  16. package/dist/classic/app/ClassicApp.js +1 -1
  17. package/dist/classic/app/ClassicApp.js.map +1 -1
  18. package/dist/classic/app/wiring-lifecycle.js +6 -1
  19. package/dist/classic/app/wiring-lifecycle.js.map +1 -1
  20. package/dist/classic/chrome/Composer.d.ts +2 -0
  21. package/dist/classic/chrome/Composer.js +2 -1
  22. package/dist/classic/chrome/Composer.js.map +1 -1
  23. package/dist/classic/chrome/composer-controller.d.ts +3 -0
  24. package/dist/classic/chrome/composer-controller.js +41 -7
  25. package/dist/classic/chrome/composer-controller.js.map +1 -1
  26. package/dist/classic/chrome/editor-view.d.ts +5 -0
  27. package/dist/classic/chrome/editor-view.js +54 -4
  28. package/dist/classic/chrome/editor-view.js.map +1 -1
  29. package/dist/commands/update-install.d.ts +10 -1
  30. package/dist/commands/update-install.js +165 -11
  31. package/dist/commands/update-install.js.map +1 -1
  32. package/dist/commands/update.d.ts +2 -2
  33. package/dist/commands/update.js +2 -1
  34. package/dist/commands/update.js.map +1 -1
  35. package/dist/instructions/load.d.ts +19 -0
  36. package/dist/instructions/load.js +123 -0
  37. package/dist/instructions/load.js.map +1 -0
  38. package/dist/instructions/locations.d.ts +23 -0
  39. package/dist/instructions/locations.js +167 -0
  40. package/dist/instructions/locations.js.map +1 -0
  41. package/dist/instructions/record.d.ts +22 -0
  42. package/dist/instructions/record.js +157 -0
  43. package/dist/instructions/record.js.map +1 -0
  44. package/dist/instructions/scaffold.d.ts +8 -0
  45. package/dist/instructions/scaffold.js +70 -0
  46. package/dist/instructions/scaffold.js.map +1 -0
  47. package/dist/llm/http.js +6 -3
  48. package/dist/llm/http.js.map +1 -1
  49. package/dist/llm/token-usage.js +10 -0
  50. package/dist/llm/token-usage.js.map +1 -1
  51. package/dist/modes/ask.js +4 -0
  52. package/dist/modes/ask.js.map +1 -1
  53. package/dist/prompts/embedded.js +1 -1
  54. package/dist/prompts/embedded.js.map +1 -1
  55. package/dist/prompts/index.js +11 -1
  56. package/dist/prompts/index.js.map +1 -1
  57. package/dist/prompts/system.agent.md +8 -7
  58. package/dist/safety/classifier.js +9 -0
  59. package/dist/safety/classifier.js.map +1 -1
  60. package/dist/skills/catalog.d.ts +13 -0
  61. package/dist/skills/catalog.js +119 -0
  62. package/dist/skills/catalog.js.map +1 -0
  63. package/dist/skills/discover.d.ts +8 -0
  64. package/dist/skills/discover.js +203 -0
  65. package/dist/skills/discover.js.map +1 -0
  66. package/dist/skills/format.d.ts +3 -0
  67. package/dist/skills/format.js +29 -0
  68. package/dist/skills/format.js.map +1 -0
  69. package/dist/skills/frontmatter.d.ts +8 -0
  70. package/dist/skills/frontmatter.js +151 -0
  71. package/dist/skills/frontmatter.js.map +1 -0
  72. package/dist/skills/locations.d.ts +10 -0
  73. package/dist/skills/locations.js +174 -0
  74. package/dist/skills/locations.js.map +1 -0
  75. package/dist/skills/mentions.d.ts +9 -0
  76. package/dist/skills/mentions.js +31 -0
  77. package/dist/skills/mentions.js.map +1 -0
  78. package/dist/skills/registry.d.ts +12 -0
  79. package/dist/skills/registry.js +141 -0
  80. package/dist/skills/registry.js.map +1 -0
  81. package/dist/skills/types.d.ts +33 -0
  82. package/dist/skills/types.js +8 -0
  83. package/dist/skills/types.js.map +1 -0
  84. package/dist/tools/definitions.js +40 -0
  85. package/dist/tools/definitions.js.map +1 -1
  86. package/dist/tools/instructions.d.ts +2 -0
  87. package/dist/tools/instructions.js +54 -0
  88. package/dist/tools/instructions.js.map +1 -0
  89. package/dist/tools/registry.js +14 -0
  90. package/dist/tools/registry.js.map +1 -1
  91. package/dist/tools/skills.d.ts +3 -0
  92. package/dist/tools/skills.js +99 -0
  93. package/dist/tools/skills.js.map +1 -0
  94. package/dist/tui-v2/components/completion/completion-menu.js +1 -1
  95. package/dist/tui-v2/components/completion/completion-menu.js.map +1 -1
  96. package/dist/tui-v2/composer/composer-editor.js +61 -18
  97. package/dist/tui-v2/composer/composer-editor.js.map +1 -1
  98. package/dist/tui-v2/composer/skill-highlight.d.ts +3 -0
  99. package/dist/tui-v2/composer/skill-highlight.js +63 -0
  100. package/dist/tui-v2/composer/skill-highlight.js.map +1 -0
  101. package/dist/tui-v2/composer/use-draft-actions.d.ts +1 -0
  102. package/dist/tui-v2/composer/use-draft-actions.js +13 -1
  103. package/dist/tui-v2/composer/use-draft-actions.js.map +1 -1
  104. package/dist/ui-core/bootstrap/composition-root.js +3 -6
  105. package/dist/ui-core/bootstrap/composition-root.js.map +1 -1
  106. package/dist/ui-core/commands/command-handlers.js +2 -0
  107. package/dist/ui-core/commands/command-handlers.js.map +1 -1
  108. package/dist/ui-core/commands/config-commands.js +7 -2
  109. package/dist/ui-core/commands/config-commands.js.map +1 -1
  110. package/dist/ui-core/commands/skill-commands.d.ts +3 -0
  111. package/dist/ui-core/commands/skill-commands.js +69 -0
  112. package/dist/ui-core/commands/skill-commands.js.map +1 -0
  113. package/dist/ui-core/composer/completion.d.ts +6 -0
  114. package/dist/ui-core/composer/completion.js +24 -13
  115. package/dist/ui-core/composer/completion.js.map +1 -1
  116. package/dist/ui-core/composer/composer-action-port.d.ts +3 -0
  117. package/dist/ui-core/composer/composer-action-port.js +14 -0
  118. package/dist/ui-core/composer/composer-action-port.js.map +1 -1
  119. package/dist/ui-core/composer/insert-token.d.ts +1 -0
  120. package/dist/ui-core/composer/insert-token.js +5 -0
  121. package/dist/ui-core/composer/insert-token.js.map +1 -0
  122. package/dist/version.generated.d.ts +2 -2
  123. package/dist/version.generated.js +2 -2
  124. package/package.json +1 -1
@@ -2,11 +2,13 @@ import type { ReactNode } from "react";
2
2
  import type { InkTheme } from "../render/ink-theme.js";
3
3
  import type { ComposerFrame } from "./composer-frame.js";
4
4
  import type { EditorState } from "./editor-model.js";
5
+ import { type EditorSpan } from "./editor-view.js";
5
6
  export interface ComposerProps {
6
7
  readonly ink: InkTheme;
7
8
  readonly frame: ComposerFrame;
8
9
  readonly state: EditorState;
9
10
  readonly scrollTop?: number | undefined;
10
11
  readonly onScrollTop?: ((top: number) => void) | undefined;
12
+ readonly accentSpans?: readonly EditorSpan[] | undefined;
11
13
  }
12
14
  export declare function Composer(props: ComposerProps): ReactNode;
@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
2
2
  import { Box, Text } from "ink";
3
3
  import { clipToWidth, padToWidth } from "../render/ansi-text.js";
4
4
  import { layoutWidth } from "../render/measure.js";
5
- import { layoutEditor, renderEditor, scrollTop } from "./editor-view.js";
5
+ import { layoutEditor, renderEditor, scrollTop, } from "./editor-view.js";
6
6
  /**
7
7
  * Top border with the session meta (`provider · model · permission`) tucked
8
8
  * into the rule, flush right — the same placement the OpenTUI composer gives
@@ -45,6 +45,7 @@ export function Composer(props) {
45
45
  scrollTop: top,
46
46
  showCaret: frame.showCaret,
47
47
  placeholder: state.text.length === 0 ? frame.placeholder : undefined,
48
+ ...(props.accentSpans ? { accentSpans: props.accentSpans } : {}),
48
49
  });
49
50
  const glyphs = ink.glyphs;
50
51
  const vertical = ink.fg(frame.borderColor, glyphs.boxVertical);
@@ -1 +1 @@
1
- {"version":3,"file":"Composer.js","sourceRoot":"","sources":["../../../src/classic/chrome/Composer.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Composer.js","sourceRoot":"","sources":["../../../src/classic/chrome/Composer.tsx"],"names":[],"mappings":"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"}
@@ -4,8 +4,10 @@ import { type ClipboardImageCapture } from "../../attachments/clipboard-image.js
4
4
  import type { ActionId } from "../../ui-core/actions/action-id.js";
5
5
  import { type CompletionMenu } from "../../ui-core/composer/completion.js";
6
6
  import { type PastePlaceholderEntry } from "../../ui-core/composer/paste-placeholder.js";
7
+ import type { EditorSpan } from "./editor-view.js";
7
8
  import { type EditorState } from "./editor-model.js";
8
9
  export interface ComposerSnapshot {
10
+ readonly skillSpans: readonly EditorSpan[];
9
11
  readonly state: EditorState;
10
12
  readonly menu: CompletionMenu;
11
13
  readonly active: number;
@@ -40,6 +42,7 @@ export declare class ComposerController {
40
42
  menuOpen(): boolean;
41
43
  menuItemCount(): number;
42
44
  insertText(text: string): void;
45
+ insertToken(token: string): void;
43
46
  paste(text: string): void;
44
47
  private insertAttachmentText;
45
48
  private pasteClipboardImage;
@@ -1,16 +1,20 @@
1
1
  import { captureClipboardImage as captureSystemClipboardImage, } from "../../attachments/clipboard-image.js";
2
2
  import { formatAttachmentReference, stabilizeDroppedFilesInText, } from "../../ui/mentions.js";
3
3
  import { ARROW_BURST_WINDOW_MS, resolveArrowIntent, } from "../../ui-core/composer/arrow-intent.js";
4
- import { resolveCompletionMenu, sameCompletionMenu, } from "../../ui-core/composer/completion.js";
4
+ import { activateSlashCompletion, resolveCompletionMenu, sameCompletionMenu, } from "../../ui-core/composer/completion.js";
5
5
  import { cutDraft, cutDraftMessage } from "../../ui-core/composer/draft-actions.js";
6
+ import { tokenInsertion } from "../../ui-core/composer/insert-token.js";
6
7
  import { shouldStoreInPromptHistory } from "../../ui-core/composer/input-history.js";
7
8
  import { isLargePaste, PasteRegistry, } from "../../ui-core/composer/paste-placeholder.js";
8
9
  import { PromptHistory } from "../../ui-core/composer/prompt-history.js";
9
10
  import { acceptCompletion, completeCommonPrefix, } from "../panels/completion-accept.js";
10
11
  import { completionItemValues } from "../panels/completion-rows.js";
12
+ import { findSkillMentions } from "../../skills/mentions.js";
13
+ import { skillNamesSnapshot } from "../../skills/registry.js";
11
14
  import { editorEditFor } from "./composer-keys.js";
12
15
  import { EMPTY_EDITOR, caretPosition, insert, logicalLines } from "./editor-model.js";
13
16
  const NO_MENU = { kind: "none" };
17
+ const EMPTY_SPANS = [];
14
18
  export class ComposerController {
15
19
  deps;
16
20
  snapshot = {
@@ -19,6 +23,7 @@ export class ComposerController {
19
23
  active: 0,
20
24
  pastes: [],
21
25
  acceptedSlash: undefined,
26
+ skillSpans: EMPTY_SPANS,
22
27
  };
23
28
  listeners = new Set();
24
29
  history = new PromptHistory();
@@ -55,6 +60,12 @@ export class ComposerController {
55
60
  return;
56
61
  this.commit(insert(this.snapshot.state, text), { resetHistory: true });
57
62
  }
63
+ insertToken(token) {
64
+ if (token.length === 0)
65
+ return;
66
+ const { text, cursor } = this.snapshot.state;
67
+ this.insertText(tokenInsertion(text.slice(0, cursor), token));
68
+ }
58
69
  paste(text) {
59
70
  if (text.length === 0) {
60
71
  this.pasteClipboardImage();
@@ -206,13 +217,27 @@ export class ComposerController {
206
217
  if (chord !== "tab" && chord !== "enter")
207
218
  return false;
208
219
  const menu = this.snapshot.menu;
209
- if (chord === "enter" &&
210
- menu.kind === "slash" &&
211
- this.snapshot.acceptedSlash !== undefined) {
212
- this.submit();
220
+ if (chord === "enter" && menu.kind === "slash") {
221
+ const activated = activateSlashCompletion(menu, this.snapshot.state.text, this.snapshot.active);
222
+ if (!activated)
223
+ return true;
224
+ this.history.reset();
225
+ this.publish({
226
+ state: {
227
+ text: activated.value,
228
+ cursor: activated.cursorOffset,
229
+ },
230
+ menu: NO_MENU,
231
+ active: 0,
232
+ pastes: this.pastes.activeIn(activated.value),
233
+ acceptedSlash: undefined,
234
+ });
235
+ this.deps.onSubmit(activated.command);
213
236
  return true;
214
237
  }
215
- if (chord === "tab" && menu.kind === "slash" && this.snapshot.acceptedSlash !== undefined) {
238
+ if (chord === "tab" &&
239
+ menu.kind === "slash" &&
240
+ this.snapshot.acceptedSlash !== undefined) {
216
241
  return true;
217
242
  }
218
243
  if (chord === "tab") {
@@ -337,7 +362,16 @@ export class ComposerController {
337
362
  });
338
363
  }
339
364
  publish(snapshot) {
340
- this.snapshot = snapshot;
365
+ const known = skillNamesSnapshot();
366
+ this.snapshot = {
367
+ ...snapshot,
368
+ skillSpans: known.size === 0
369
+ ? EMPTY_SPANS
370
+ : findSkillMentions(snapshot.state.text, known).map((mention) => ({
371
+ start: mention.start,
372
+ end: mention.end,
373
+ })),
374
+ };
341
375
  for (const listener of this.listeners)
342
376
  listener();
343
377
  }
@@ -1 +1 @@
1
- {"version":3,"file":"composer-controller.js","sourceRoot":"","sources":["../../../src/classic/chrome/composer-controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"composer-controller.js","sourceRoot":"","sources":["../../../src/classic/chrome/composer-controller.ts"],"names":[],"mappings":"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"}
@@ -14,6 +14,10 @@ export interface EditorLayout {
14
14
  }
15
15
  export declare function layoutEditor(state: EditorState, width: number): EditorLayout;
16
16
  export declare function scrollTop(layout: EditorLayout, height: number, previousTop?: number): number;
17
+ export interface EditorSpan {
18
+ readonly start: number;
19
+ readonly end: number;
20
+ }
17
21
  export interface RenderEditorInput {
18
22
  readonly state: EditorState;
19
23
  readonly layout: EditorLayout;
@@ -22,6 +26,7 @@ export interface RenderEditorInput {
22
26
  readonly scrollTop: number;
23
27
  readonly showCaret: boolean;
24
28
  readonly placeholder: string | undefined;
29
+ readonly accentSpans?: readonly EditorSpan[] | undefined;
25
30
  }
26
31
  export interface RenderedEditor {
27
32
  readonly rows: readonly string[];
@@ -81,6 +81,56 @@ export function renderCaretRow(ink, text, caretColumn, showCaret) {
81
81
  }
82
82
  return sealStyle(`${text}${ink.inverse(" ")}`);
83
83
  }
84
+ function paintAccentText(ink, text, origin, spans) {
85
+ if (text.length === 0)
86
+ return "";
87
+ const end = origin + text.length;
88
+ const overlapping = spans
89
+ .filter((span) => span.end > origin && span.start < end)
90
+ .sort((a, b) => a.start - b.start);
91
+ if (overlapping.length === 0)
92
+ return ink.fg("white", text);
93
+ const pieces = [];
94
+ let cursor = origin;
95
+ for (const span of overlapping) {
96
+ const from = Math.max(span.start, origin);
97
+ const to = Math.min(span.end, end);
98
+ if (to <= cursor)
99
+ continue;
100
+ if (from > cursor) {
101
+ pieces.push(ink.fg("white", text.slice(cursor - origin, from - origin)));
102
+ }
103
+ pieces.push(ink.style(text.slice(from - origin, to - origin), {
104
+ fg: "activity",
105
+ bold: true,
106
+ }));
107
+ cursor = to;
108
+ }
109
+ if (cursor < end)
110
+ pieces.push(ink.fg("white", text.slice(cursor - origin)));
111
+ return pieces.join("");
112
+ }
113
+ function paintAccentRow(ink, row, spans) {
114
+ return sealStyle(paintAccentText(ink, row.text, row.start, spans));
115
+ }
116
+ function paintCaretRow(ink, row, caretColumn, showCaret, spans) {
117
+ if (!showCaret)
118
+ return paintAccentRow(ink, row, spans);
119
+ const text = row.text;
120
+ const bounds = boundaries(text);
121
+ let column = 0;
122
+ for (let index = 1; index < bounds.length; index += 1) {
123
+ const from = bounds[index - 1];
124
+ const to = bounds[index];
125
+ if (column === caretColumn) {
126
+ return sealStyle(paintAccentText(ink, text.slice(0, from), row.start, spans) +
127
+ ink.inverse(text.slice(from, to)) +
128
+ paintAccentText(ink, text.slice(to), row.start + to, spans));
129
+ }
130
+ column += layoutWidth(text.slice(from, to));
131
+ }
132
+ return sealStyle(paintAccentText(ink, text, row.start, spans) + ink.inverse(" "));
133
+ }
84
134
  export function renderEditor(input) {
85
135
  const { layout, ink } = input;
86
136
  const height = Math.max(1, input.height);
@@ -103,12 +153,12 @@ export function renderEditor(input) {
103
153
  clippedBelow: false,
104
154
  };
105
155
  }
156
+ const accentSpans = input.accentSpans ?? [];
106
157
  const rows = visible.map((row, index) => {
107
158
  const absolute = top + index;
108
- const text = absolute === layout.caretRow
109
- ? renderCaretRow(ink, row.text, layout.caretColumn, input.showCaret)
110
- : row.text;
111
- return ink.fg("white", text);
159
+ return absolute === layout.caretRow
160
+ ? paintCaretRow(ink, row, layout.caretColumn, input.showCaret, accentSpans)
161
+ : paintAccentRow(ink, row, accentSpans);
112
162
  });
113
163
  while (rows.length < height)
114
164
  rows.push("");
@@ -1 +1 @@
1
- {"version":3,"file":"editor-view.js","sourceRoot":"","sources":["../../../src/classic/chrome/editor-view.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"editor-view.js","sourceRoot":"","sources":["../../../src/classic/chrome/editor-view.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,4 @@
1
+ import { type SudoAuthOutcome } from "../tools/sudo-session.js";
1
2
  export declare const REPO = "pentoshi007/clai";
2
3
  export declare const PACKAGE_NAME = "@pentoshi/clai";
3
4
  export declare const DEFAULT_MIRROR_BASE = "https://downloads.clai.aniketpandey.website";
@@ -50,8 +51,9 @@ export interface PerformUpdateOptions {
50
51
  /** inherit: let the child write to the terminal (CLI). pipe: capture + log (TUI). */
51
52
  readonly stdio?: "inherit" | "pipe";
52
53
  readonly onProgress?: ((progress: UpdateProgress) => void) | undefined;
53
- /** Abort an in-flight download/install (TUI Esc / Ctrl+C). */
54
54
  readonly signal?: AbortSignal | undefined;
55
+ readonly requestSecret?: SecretRequester | undefined;
56
+ readonly elevation?: UpdateElevation | undefined;
55
57
  }
56
58
  export type UpdateProgress = {
57
59
  readonly phase: "downloading";
@@ -64,6 +66,13 @@ export type UpdateProgress = {
64
66
  readonly detail?: string | undefined;
65
67
  };
66
68
  export declare const ELEVATION_TIMEOUT_MS = 20000;
69
+ export interface UpdateElevation {
70
+ readonly auth: SudoAuthOutcome;
71
+ }
72
+ export type SecretRequester = (request: {
73
+ title: string;
74
+ prompt: string;
75
+ }) => Promise<string | undefined>;
67
76
  export declare function installDirectBinary(options: Required<Pick<PerformUpdateOptions, "version" | "method">> & PerformUpdateOptions): Promise<UpdateInstallResult>;
68
77
  export declare function installViaPackageManager(options: Required<Pick<PerformUpdateOptions, "version" | "method">> & PerformUpdateOptions): Promise<UpdateInstallResult>;
69
78
  export declare function performUpdate(options: PerformUpdateOptions): Promise<UpdateInstallResult>;
@@ -1,9 +1,10 @@
1
1
  import { spawn } from "node:child_process";
2
2
  import { createHash } from "node:crypto";
3
- import { chmodSync, existsSync, mkdtempSync, realpathSync, renameSync, rmSync, writeFileSync, } from "node:fs";
3
+ import { accessSync, chmodSync, constants, existsSync, mkdtempSync, realpathSync, renameSync, rmSync, writeFileSync, } from "node:fs";
4
4
  import { homedir, tmpdir } from "node:os";
5
- import { basename, join } from "node:path";
5
+ import { basename, dirname, join } from "node:path";
6
6
  import chalk from "chalk";
7
+ import { evictSudoSession, formatSudoStdinPassword, looksLikeSudoAuthError, obtainSudoPassword, } from "../tools/sudo-session.js";
7
8
  export const REPO = "pentoshi007/clai";
8
9
  export const PACKAGE_NAME = "@pentoshi/clai";
9
10
  export const DEFAULT_MIRROR_BASE = "https://downloads.clai.aniketpandey.website";
@@ -204,9 +205,13 @@ function logOf(log) {
204
205
  return log ?? ((line) => console.log(line));
205
206
  }
206
207
  export const ELEVATION_TIMEOUT_MS = 20_000;
208
+ const SUDO_MOVE_TIMEOUT_MS = 30_000;
207
209
  function escalationFailure(execPath) {
208
210
  return new Error(`needs elevated permission to replace ${execPath} — run \`sudo clai update\` in a terminal to finish`);
209
211
  }
212
+ function escalationCancelled(execPath) {
213
+ return new Error(`update cancelled: could not replace ${execPath} without elevated permission`);
214
+ }
210
215
  async function elevateReplace(tmp, execPath, interactive) {
211
216
  await new Promise((resolve, reject) => {
212
217
  const args = interactive
@@ -248,7 +253,116 @@ async function elevateReplace(tmp, execPath, interactive) {
248
253
  }));
249
254
  });
250
255
  }
251
- async function replaceExecutable(tmp, execPath, platform, interactive) {
256
+ function buildWindowsSwapScript(sourcePath, execPath, exe, cleanupStageDir) {
257
+ return (`@echo off\r\n` +
258
+ `:loop\r\n` +
259
+ `tasklist /FI "IMAGENAME eq ${exe}" 2>nul | find /I "${exe}" >nul && (timeout /t 1 /nobreak >nul & goto loop)\r\n` +
260
+ `move /y "${sourcePath}" "${execPath}"\r\n` +
261
+ (cleanupStageDir
262
+ ? `cd /d "%TEMP%"\r\nrd /s /q "${cleanupStageDir}"\r\n`
263
+ : `del "%~f0"\r\n`));
264
+ }
265
+ function stageElevatedWindowsSwap(tmp, execPath, exe) {
266
+ const stageDir = mkdtempSync(join(tmpdir(), "clai-update-stage-"));
267
+ const stagedBin = join(stageDir, exe);
268
+ renameSync(tmp, stagedBin);
269
+ const batPath = join(stageDir, "apply-update.cmd");
270
+ writeFileSync(batPath, buildWindowsSwapScript(stagedBin, execPath, exe, stageDir));
271
+ return new Promise((resolve, reject) => {
272
+ let child;
273
+ try {
274
+ child = spawn("powershell.exe", [
275
+ "-NoProfile",
276
+ "-NonInteractive",
277
+ "-WindowStyle",
278
+ "Hidden",
279
+ "-Command",
280
+ `Start-Process -Verb RunAs -WindowStyle Hidden -FilePath '${batPath.replace(/'/g, "''")}'`,
281
+ ], { stdio: ["ignore", "ignore", "pipe"], windowsHide: true });
282
+ }
283
+ catch {
284
+ reject(new Error(`needs administrator permission to replace ${execPath} — close clai and run \`clai update\` from a terminal started with "Run as administrator"`));
285
+ return;
286
+ }
287
+ let settled = false;
288
+ const finish = (fn) => {
289
+ if (settled)
290
+ return;
291
+ settled = true;
292
+ clearTimeout(timer);
293
+ fn();
294
+ };
295
+ const timer = setTimeout(() => {
296
+ try {
297
+ child.kill("SIGKILL");
298
+ }
299
+ catch { }
300
+ finish(() => reject(new Error(`timed out waiting for the administrator approval dialog — close clai and run \`clai update\` from a terminal started with "Run as administrator"`)));
301
+ }, 120_000);
302
+ timer.unref?.();
303
+ child.on("error", () => finish(() => reject(new Error(`needs administrator permission to replace ${execPath} — close clai and run \`clai update\` from a terminal started with "Run as administrator"`))));
304
+ child.on("close", (status) => finish(() => {
305
+ if (status === 0) {
306
+ resolve();
307
+ return;
308
+ }
309
+ reject(new Error(`administrator approval was declined — update aborted before replacing ${execPath}`));
310
+ }));
311
+ });
312
+ }
313
+ function spawnElevatedMove(tmp, execPath, password) {
314
+ return new Promise((resolve, reject) => {
315
+ let child;
316
+ try {
317
+ child = spawn("sudo", ["-S", "-p", "", "--", "mv", "-f", tmp, execPath], {
318
+ stdio: ["pipe", "pipe", "pipe"],
319
+ windowsHide: true,
320
+ });
321
+ }
322
+ catch {
323
+ reject(escalationFailure(execPath));
324
+ return;
325
+ }
326
+ let stderrText = "";
327
+ let settled = false;
328
+ const finish = (fn) => {
329
+ if (settled)
330
+ return;
331
+ settled = true;
332
+ clearTimeout(timer);
333
+ fn();
334
+ };
335
+ const timer = setTimeout(() => {
336
+ try {
337
+ child.kill("SIGKILL");
338
+ }
339
+ catch { }
340
+ finish(() => reject(escalationFailure(execPath)));
341
+ }, SUDO_MOVE_TIMEOUT_MS);
342
+ timer.unref?.();
343
+ child.stdout?.on("data", () => { });
344
+ child.stderr?.on("data", (d) => {
345
+ if (stderrText.length < 4096)
346
+ stderrText += String(d);
347
+ });
348
+ child.on("error", () => finish(() => reject(escalationFailure(execPath))));
349
+ child.on("close", (status) => finish(() => {
350
+ if (status === 0) {
351
+ resolve();
352
+ return;
353
+ }
354
+ if (looksLikeSudoAuthError(stderrText))
355
+ evictSudoSession(password);
356
+ reject(escalationFailure(execPath));
357
+ }));
358
+ try {
359
+ child.stdin?.write(formatSudoStdinPassword(password));
360
+ child.stdin?.end();
361
+ }
362
+ catch { }
363
+ });
364
+ }
365
+ async function replaceExecutable(tmp, execPath, platform, interactive, elevation) {
252
366
  if (platform !== "win32") {
253
367
  try {
254
368
  renameSync(tmp, execPath);
@@ -258,6 +372,12 @@ async function replaceExecutable(tmp, execPath, platform, interactive) {
258
372
  const code = error.code;
259
373
  if (code !== "EACCES" && code !== "EPERM")
260
374
  throw error;
375
+ if (elevation?.auth.status === "granted") {
376
+ await spawnElevatedMove(tmp, execPath, elevation.auth.password);
377
+ return;
378
+ }
379
+ if (elevation?.auth.status === "cancelled")
380
+ throw escalationCancelled(execPath);
261
381
  await elevateReplace(tmp, execPath, interactive);
262
382
  return;
263
383
  }
@@ -267,13 +387,17 @@ async function replaceExecutable(tmp, execPath, platform, interactive) {
267
387
  const newPath = `${execPath}.update`;
268
388
  const batPath = `${execPath}.update.cmd`;
269
389
  const exe = basename(execPath);
270
- renameSync(tmp, newPath);
271
- const script = `@echo off\r\n` +
272
- `:loop\r\n` +
273
- `tasklist /FI "IMAGENAME eq ${exe}" 2>nul | find /I "${exe}" >nul && (timeout /t 1 /nobreak >nul & goto loop)\r\n` +
274
- `move /y "${newPath}" "${execPath}"\r\n` +
275
- `del "%~f0"\r\n`;
276
- writeFileSync(batPath, script);
390
+ try {
391
+ renameSync(tmp, newPath);
392
+ writeFileSync(batPath, buildWindowsSwapScript(newPath, execPath, exe));
393
+ }
394
+ catch (error) {
395
+ const code = error.code;
396
+ if (code !== "EACCES" && code !== "EPERM")
397
+ throw error;
398
+ await stageElevatedWindowsSwap(tmp, execPath, exe);
399
+ return;
400
+ }
277
401
  const child = spawn("cmd", ["/c", "start", "", "/min", batPath], {
278
402
  detached: true,
279
403
  stdio: "ignore",
@@ -295,6 +419,36 @@ export async function installDirectBinary(options) {
295
419
  const sumUrls = useMirror
296
420
  ? [`${base}/${target.file}.sha256`, `${mirror}/v${options.version}/${target.file}.sha256`]
297
421
  : [`${base}/${target.file}.sha256`];
422
+ let elevation = options.elevation;
423
+ if (process.platform !== "win32") {
424
+ let writable = false;
425
+ try {
426
+ accessSync(dirname(execPath), constants.W_OK | constants.X_OK);
427
+ writable = true;
428
+ }
429
+ catch {
430
+ writable = false;
431
+ }
432
+ if (!writable && (process.getuid?.() ?? 1) === 0) {
433
+ writable = true;
434
+ }
435
+ if (!writable && elevation === undefined) {
436
+ if (options.requestSecret) {
437
+ const auth = await obtainSudoPassword({
438
+ requestSecret: options.requestSecret,
439
+ title: "Administrator access",
440
+ prompt: `Updating clai will replace ${execPath}, which needs admin permission. Enter your password for sudo. It is sent only to sudo stdin, kept in memory briefly, and never written to disk. Esc cancels.`,
441
+ ...(options.signal ? { signal: options.signal } : {}),
442
+ }, {});
443
+ if (auth.status === "cancelled")
444
+ throw escalationCancelled(execPath);
445
+ if (auth.status === "failed") {
446
+ throw new Error(`sudo authentication failed — could not replace ${execPath}${auth.detail ? ` (${auth.detail})` : ""}`);
447
+ }
448
+ elevation = { auth };
449
+ }
450
+ }
451
+ }
298
452
  log(chalk.dim(` ⬇ Downloading ${target.file} (v${options.version})…`));
299
453
  let bin = null;
300
454
  let lastError;
@@ -350,7 +504,7 @@ export async function installDirectBinary(options) {
350
504
  // ignore
351
505
  }
352
506
  }
353
- await replaceExecutable(tmp, execPath, process.platform, (options.stdio ?? "inherit") === "inherit");
507
+ await replaceExecutable(tmp, execPath, process.platform, (options.stdio ?? "inherit") === "inherit", elevation);
354
508
  }
355
509
  finally {
356
510
  rmSync(dir, { recursive: true, force: true });