toolcraft 0.0.163 → 0.0.165

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 (22) hide show
  1. package/composition.json +3 -3
  2. package/dist/composition.json +3 -3
  3. package/node_modules/@poe-code/config-mutations/dist/execution/apply-mutation.js +1 -3
  4. package/node_modules/@poe-code/config-mutations/dist/formats/json.js +1 -3
  5. package/node_modules/@poe-code/config-mutations/dist/formats/toml.js +1 -3
  6. package/node_modules/@poe-code/config-mutations/dist/formats/yaml.js +1 -3
  7. package/node_modules/@poe-code/config-mutations/dist/types.js +1 -1
  8. package/node_modules/@poe-code/task-list/dist/backends/utils.js +32 -37
  9. package/node_modules/@poe-code/task-list/dist/types.d.ts +1 -0
  10. package/node_modules/auth-store/dist/provider-store.js +3 -0
  11. package/node_modules/tiny-http-mcp-server/dist/composition.json +1 -1
  12. package/node_modules/tiny-http-mcp-server/package.json +1 -1
  13. package/node_modules/tiny-stdio-mcp-server/dist/composition.json +1 -1
  14. package/node_modules/toolcraft-design/dist/prompts/interactive/core.d.ts +4 -2
  15. package/node_modules/toolcraft-design/dist/prompts/interactive/core.js +60 -24
  16. package/node_modules/toolcraft-design/dist/prompts/interactive/multiselect.js +3 -2
  17. package/node_modules/toolcraft-design/dist/prompts/interactive/pagination.js +21 -27
  18. package/node_modules/toolcraft-design/dist/prompts/interactive/password.js +11 -8
  19. package/node_modules/toolcraft-design/dist/prompts/interactive/select.js +3 -2
  20. package/node_modules/toolcraft-design/dist/prompts/interactive/text.js +12 -9
  21. package/node_modules/toolcraft-schema/package.json +1 -1
  22. package/package.json +2 -2
package/composition.json CHANGED
@@ -98,7 +98,7 @@
98
98
  },
99
99
  {
100
100
  "name": "tiny-http-mcp-server",
101
- "version": "0.1.7",
101
+ "version": "0.1.8",
102
102
  "license": "MIT"
103
103
  },
104
104
  {
@@ -113,7 +113,7 @@
113
113
  },
114
114
  {
115
115
  "name": "toolcraft",
116
- "version": "0.0.163",
116
+ "version": "0.0.165",
117
117
  "license": "MIT"
118
118
  },
119
119
  {
@@ -123,7 +123,7 @@
123
123
  },
124
124
  {
125
125
  "name": "toolcraft-schema",
126
- "version": "0.0.163",
126
+ "version": "0.0.165",
127
127
  "license": "MIT"
128
128
  },
129
129
  {
@@ -98,7 +98,7 @@
98
98
  },
99
99
  {
100
100
  "name": "tiny-http-mcp-server",
101
- "version": "0.1.7",
101
+ "version": "0.1.8",
102
102
  "license": "MIT"
103
103
  },
104
104
  {
@@ -113,7 +113,7 @@
113
113
  },
114
114
  {
115
115
  "name": "toolcraft",
116
- "version": "0.0.163",
116
+ "version": "0.0.165",
117
117
  "license": "MIT"
118
118
  },
119
119
  {
@@ -123,7 +123,7 @@
123
123
  },
124
124
  {
125
125
  "name": "toolcraft-schema",
126
- "version": "0.0.163",
126
+ "version": "0.0.165",
127
127
  "license": "MIT"
128
128
  },
129
129
  {
@@ -1,6 +1,7 @@
1
1
  import { randomUUID } from "node:crypto";
2
2
  import path from "node:path";
3
3
  import { renderTemplate } from "toolcraft-design";
4
+ import { isConfigObject } from "../types.js";
4
5
  import { getConfigFormat, detectFormat } from "../formats/index.js";
5
6
  import { cloneConfigObject, setConfigEntry } from "../formats/object.js";
6
7
  import { resolvePath } from "./path-utils.js";
@@ -187,9 +188,6 @@ function pruneKeysByPrefix(table, prefix) {
187
188
  }
188
189
  return result;
189
190
  }
190
- function isConfigObject(value) {
191
- return typeof value === "object" && value !== null && !Array.isArray(value);
192
- }
193
191
  function mergeWithPruneByPrefix(base, patch, pruneByPrefix) {
194
192
  const result = cloneConfigObject(base);
195
193
  const prefixMap = pruneByPrefix ?? {};
@@ -1,8 +1,6 @@
1
1
  import * as jsonc from "jsonc-parser";
2
+ import { isConfigObject } from "../types.js";
2
3
  import { cloneConfigObject, hasConfigEntry, setConfigEntry } from "./object.js";
3
- function isConfigObject(value) {
4
- return typeof value === "object" && value !== null && !Array.isArray(value);
5
- }
6
4
  function detectIndent(content) {
7
5
  const match = content.match(/^[\t ]+/m);
8
6
  if (match) {
@@ -1,8 +1,6 @@
1
1
  import { parse as parseToml, stringify as stringifyToml } from "smol-toml";
2
+ import { isConfigObject } from "../types.js";
2
3
  import { cloneConfigObject, hasConfigEntry, setConfigEntry } from "./object.js";
3
- function isConfigObject(value) {
4
- return typeof value === "object" && value !== null && !Array.isArray(value);
5
- }
6
4
  function parse(content) {
7
5
  if (!content || content.trim() === "") {
8
6
  return {};
@@ -1,8 +1,6 @@
1
1
  import { parse as parseYaml, stringify as stringifyYaml } from "yaml";
2
+ import { isConfigObject } from "../types.js";
2
3
  import { cloneConfigObject, hasConfigEntry, setConfigEntry } from "./object.js";
3
- function isConfigObject(value) {
4
- return typeof value === "object" && value !== null && !Array.isArray(value);
5
- }
6
4
  function parse(content) {
7
5
  if (!content || content.trim() === "") {
8
6
  return {};
@@ -2,5 +2,5 @@
2
2
  // Config Object Types
3
3
  // ============================================================================
4
4
  export function isConfigObject(value) {
5
- return typeof value === "object" && value !== null && !Array.isArray(value);
5
+ return (typeof value === "object" && value !== null && !Array.isArray(value) && !(value instanceof Date));
6
6
  }
@@ -1,5 +1,7 @@
1
1
  import { randomUUID } from "node:crypto";
2
2
  import path from "node:path";
3
+ const LOCK_WAIT_MS = 30_000;
4
+ const LOCK_RETRY_MS = 10;
3
5
  export function compareCreated(left, right) {
4
6
  const leftCreated = typeof left.raw.created === "string" ? left.raw.created : "";
5
7
  const rightCreated = typeof right.raw.created === "string" ? right.raw.created : "";
@@ -10,7 +12,14 @@ export function compareCreated(left, right) {
10
12
  return 1;
11
13
  if (rightCreated === "")
12
14
  return -1;
13
- return leftCreated.localeCompare(rightCreated);
15
+ const leftTimestamp = Date.parse(leftCreated);
16
+ const rightTimestamp = Date.parse(rightCreated);
17
+ if (Number.isNaN(leftTimestamp)) {
18
+ return Number.isNaN(rightTimestamp) ? leftCreated.localeCompare(rightCreated) : 1;
19
+ }
20
+ if (Number.isNaN(rightTimestamp))
21
+ return -1;
22
+ return leftTimestamp - rightTimestamp;
14
23
  }
15
24
  export function applyOrder(entries, order) {
16
25
  if (order === "alphabetical") {
@@ -123,62 +132,48 @@ export async function writeAtomically(fs, filePath, content) {
123
132
  }
124
133
  }
125
134
  export async function withFileLock(fs, lockPath, operation) {
135
+ await rejectSymbolicLinkComponents(fs, lockPath);
126
136
  await fs.mkdir(path.dirname(lockPath), { recursive: true });
137
+ const ownerPath = path.join(lockPath, `${process.pid}-${randomUUID()}`);
138
+ const deadline = Date.now() + LOCK_WAIT_MS;
127
139
  for (;;) {
140
+ await rejectSymbolicLinkComponents(fs, lockPath);
128
141
  try {
129
- await fs.writeFile(lockPath, String(process.pid), { encoding: "utf8", flag: "wx" });
142
+ await fs.mkdir(lockPath);
130
143
  break;
131
144
  }
132
145
  catch (error) {
133
146
  if (!hasErrorCode(error, "EEXIST")) {
134
- await fs.unlink(lockPath).catch(() => undefined);
135
147
  throw error;
136
148
  }
137
- if (await removeAbandonedLock(fs, lockPath)) {
138
- continue;
149
+ if (Date.now() >= deadline) {
150
+ throw new Error(`Timed out waiting for task-list lock: ${lockPath}. ` +
151
+ "An abandoned or legacy lock must only be removed after confirming all task-list operations have stopped.");
139
152
  }
140
- await Promise.resolve();
153
+ await new Promise((done) => setTimeout(done, LOCK_RETRY_MS));
141
154
  }
142
155
  }
156
+ await rejectSymbolicLinkComponents(fs, ownerPath);
157
+ await fs.mkdir(ownerPath);
158
+ let outcome;
143
159
  try {
144
- return await operation();
145
- }
146
- finally {
147
- await fs.unlink(lockPath);
148
- }
149
- }
150
- async function removeAbandonedLock(fs, lockPath) {
151
- let content;
152
- try {
153
- content = await fs.readFile(lockPath, "utf8");
160
+ outcome = { result: await operation() };
154
161
  }
155
162
  catch (error) {
156
- if (hasErrorCode(error, "ENOENT")) {
157
- return true;
158
- }
159
- throw error;
160
- }
161
- const owner = Number(content);
162
- if (Number.isInteger(owner) && owner > 0 && isProcessRunning(owner)) {
163
- return false;
163
+ outcome = { error };
164
164
  }
165
165
  try {
166
- await fs.unlink(lockPath);
167
- return true;
166
+ await rejectSymbolicLinkComponents(fs, ownerPath);
167
+ await fs.rmdir(ownerPath);
168
+ await fs.rmdir(lockPath);
168
169
  }
169
170
  catch (error) {
170
- if (hasErrorCode(error, "ENOENT")) {
171
- return true;
171
+ if ("error" in outcome) {
172
+ throw new AggregateError([outcome.error, error], "Task-list operation and lock release failed");
172
173
  }
173
174
  throw error;
174
175
  }
175
- }
176
- function isProcessRunning(pid) {
177
- try {
178
- process.kill(pid, 0);
179
- return true;
180
- }
181
- catch (error) {
182
- return !hasErrorCode(error, "ESRCH");
183
- }
176
+ if ("error" in outcome)
177
+ throw outcome.error;
178
+ return outcome.result;
184
179
  }
@@ -73,6 +73,7 @@ export interface TaskListFs {
73
73
  readFile(path: string, encoding: BufferEncoding): Promise<string>;
74
74
  readdir(path: string): Promise<string[]>;
75
75
  rename(fromPath: string, toPath: string): Promise<void>;
76
+ rmdir(path: string): Promise<void>;
76
77
  stat(path: string): Promise<{
77
78
  isDirectory(): boolean;
78
79
  isFile(): boolean;
@@ -19,6 +19,9 @@ export class MigratingSecretStore {
19
19
  await this.mutate(async () => {
20
20
  if (await this.store.get() === null) {
21
21
  try {
22
+ if (await this.legacyStore?.get() !== legacyValue) {
23
+ return;
24
+ }
22
25
  await this.store.set(legacyValue);
23
26
  }
24
27
  catch {
@@ -18,7 +18,7 @@
18
18
  },
19
19
  {
20
20
  "name": "tiny-http-mcp-server",
21
- "version": "0.1.7",
21
+ "version": "0.1.8",
22
22
  "license": "MIT"
23
23
  },
24
24
  {
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "tiny-http-mcp-server",
3
- "version": "0.1.7",
3
+ "version": "0.1.8",
4
4
  "description": "Minimal MCP server over HTTP built on tiny-stdio-mcp-server",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
@@ -8,7 +8,7 @@
8
8
  },
9
9
  {
10
10
  "name": "toolcraft-schema",
11
- "version": "0.0.163",
11
+ "version": "0.0.165",
12
12
  "license": "MIT"
13
13
  }
14
14
  ]
@@ -24,6 +24,8 @@ export interface PromptOptions<Value> {
24
24
  }
25
25
  type InputStream = NodeJS.ReadableStream & {
26
26
  isTTY?: boolean;
27
+ destroyed?: boolean;
28
+ readableEnded?: boolean;
27
29
  setRawMode?: (enabled: boolean) => void;
28
30
  unpipe?: () => void;
29
31
  };
@@ -41,17 +43,17 @@ export declare class Prompt<Value> extends EventEmitter {
41
43
  private readonly trackValue;
42
44
  private previousFrame;
43
45
  private readlineInterface?;
44
- private abortListener?;
45
46
  private closed;
46
47
  constructor(opts: PromptOptions<Value>, trackValue?: boolean);
47
48
  get cursor(): number;
48
49
  prompt(): Promise<Value | typeof CANCEL>;
49
50
  protected promptNonTty(): Promise<Value | typeof CANCEL>;
50
- protected readNonTtyLine(): Promise<string>;
51
+ protected readNonTtyLine(): Promise<string | typeof CANCEL>;
51
52
  protected setValue(value: Value | undefined): void;
52
53
  protected setError(message: string): void;
53
54
  protected setUserInput(value: string): void;
54
55
  protected clearUserInput(): void;
56
+ private readonly onCancel;
55
57
  private readonly onKeypress;
56
58
  private updateTrackedInput;
57
59
  protected readonly render: () => void;
@@ -1,5 +1,6 @@
1
1
  import { EventEmitter } from "node:events";
2
2
  import * as readline from "node:readline";
3
+ import { graphemes } from "../../dashboard/terminal-width.js";
3
4
  import { CANCEL } from "./cancel-symbol.js";
4
5
  import { mapKey } from "./keys.js";
5
6
  import { wrapFrame } from "./wrap.js";
@@ -50,7 +51,6 @@ export class Prompt extends EventEmitter {
50
51
  trackValue;
51
52
  previousFrame = "";
52
53
  readlineInterface;
53
- abortListener;
54
54
  closed = false;
55
55
  constructor(opts, trackValue = true) {
56
56
  super();
@@ -75,18 +75,16 @@ export class Prompt extends EventEmitter {
75
75
  if (this.input.isTTY !== true) {
76
76
  return this.promptNonTty();
77
77
  }
78
+ if (this.input.destroyed || this.input.readableEnded) {
79
+ this.state = "cancel";
80
+ return Promise.resolve(CANCEL);
81
+ }
78
82
  return new Promise((resolve) => {
79
83
  const onSubmit = (value) => resolve(value);
80
84
  const onCancel = () => resolve(CANCEL);
81
85
  this.once("submit", onSubmit);
82
86
  this.once("cancel", onCancel);
83
- this.abortListener = () => {
84
- this.state = "cancel";
85
- this.emit("finalize");
86
- this.render();
87
- this.close();
88
- };
89
- this.signal?.addEventListener("abort", this.abortListener, { once: true });
87
+ this.signal?.addEventListener("abort", this.onCancel, { once: true });
90
88
  this.readlineInterface = readline.createInterface({
91
89
  input: this.input,
92
90
  output: undefined,
@@ -95,6 +93,8 @@ export class Prompt extends EventEmitter {
95
93
  escapeCodeTimeout: 50,
96
94
  terminal: true
97
95
  });
96
+ this.readlineInterface.once("close", this.onCancel);
97
+ this.input.once("close", this.onCancel);
98
98
  readline.emitKeypressEvents(this.input, this.readlineInterface);
99
99
  this.readlineInterface.prompt();
100
100
  this.input.on("keypress", this.onKeypress);
@@ -117,11 +117,20 @@ export class Prompt extends EventEmitter {
117
117
  return;
118
118
  }
119
119
  settled = true;
120
+ this.signal?.removeEventListener("abort", onAbort);
120
121
  rl.close();
121
122
  resolve(value);
122
123
  };
124
+ const onAbort = () => {
125
+ this.state = "cancel";
126
+ settle(CANCEL);
127
+ };
123
128
  rl.once("line", settle);
124
129
  rl.once("close", () => settle(rl.line));
130
+ this.signal?.addEventListener("abort", onAbort, { once: true });
131
+ if (this.signal?.aborted) {
132
+ onAbort();
133
+ }
125
134
  });
126
135
  }
127
136
  setValue(value) {
@@ -134,6 +143,15 @@ export class Prompt extends EventEmitter {
134
143
  setUserInput(value) {
135
144
  this.userInput = value;
136
145
  this._cursor = Math.min(this._cursor, this.userInput.length);
146
+ if (this.trackValue) {
147
+ let boundary = 0;
148
+ for (const segment of graphemes(value)) {
149
+ if (boundary >= this._cursor)
150
+ break;
151
+ boundary += segment.length;
152
+ }
153
+ this._cursor = boundary;
154
+ }
137
155
  this.emit("userInput", this.userInput);
138
156
  }
139
157
  clearUserInput() {
@@ -141,7 +159,19 @@ export class Prompt extends EventEmitter {
141
159
  this._cursor = 0;
142
160
  this.emit("userInput", this.userInput);
143
161
  }
162
+ onCancel = () => {
163
+ if (this.closed || this.state === "submit" || this.state === "cancel") {
164
+ return;
165
+ }
166
+ this.state = "cancel";
167
+ this.emit("finalize");
168
+ this.render();
169
+ this.close();
170
+ };
144
171
  onKeypress = (char, key = {}) => {
172
+ if (this.closed) {
173
+ return;
174
+ }
145
175
  let action = mapKey(key.name, char);
146
176
  if (this.trackValue && char && char >= " " && key.name !== "return" && key.name !== "enter" && key.name !== "escape") {
147
177
  action = undefined;
@@ -187,6 +217,14 @@ export class Prompt extends EventEmitter {
187
217
  }
188
218
  };
189
219
  updateTrackedInput(char, key, action) {
220
+ if (key.name === "home") {
221
+ this._cursor = 0;
222
+ return;
223
+ }
224
+ if (key.name === "end") {
225
+ this._cursor = this.userInput.length;
226
+ return;
227
+ }
190
228
  if (key.ctrl) {
191
229
  if (key.name === "a") {
192
230
  this._cursor = 0;
@@ -197,23 +235,24 @@ export class Prompt extends EventEmitter {
197
235
  return;
198
236
  }
199
237
  if (key.name === "u") {
200
- this.userInput = this.userInput.slice(this._cursor);
238
+ const remaining = this.userInput.slice(this._cursor);
201
239
  this._cursor = 0;
202
- this.emit("userInput", this.userInput);
240
+ this.setUserInput(remaining);
203
241
  return;
204
242
  }
205
243
  if (key.name === "k") {
206
- this.userInput = this.userInput.slice(0, this._cursor);
207
- this.emit("userInput", this.userInput);
244
+ this.setUserInput(this.userInput.slice(0, this._cursor));
208
245
  return;
209
246
  }
210
247
  }
248
+ const before = this.userInput.slice(0, this._cursor);
249
+ const after = this.userInput.slice(this._cursor);
211
250
  if (action === "left") {
212
- this._cursor = Math.max(0, this._cursor - 1);
251
+ this._cursor -= graphemes(before).at(-1)?.length ?? 0;
213
252
  return;
214
253
  }
215
254
  if (action === "right") {
216
- this._cursor = Math.min(this.userInput.length, this._cursor + 1);
255
+ this._cursor += graphemes(after)[0]?.length ?? 0;
217
256
  return;
218
257
  }
219
258
  if (action === "cancel" || action === "up" || action === "down" || action === "space") {
@@ -221,25 +260,22 @@ export class Prompt extends EventEmitter {
221
260
  }
222
261
  if (key.name === "backspace" || char === "\b" || char === "\x7f") {
223
262
  if (this._cursor > 0) {
224
- this.userInput = `${this.userInput.slice(0, this._cursor - 1)}${this.userInput.slice(this._cursor)}`;
225
- this._cursor -= 1;
226
- this.emit("userInput", this.userInput);
263
+ this._cursor -= graphemes(before).at(-1)?.length ?? 0;
264
+ this.setUserInput(`${before.slice(0, this._cursor)}${after}`);
227
265
  }
228
266
  return;
229
267
  }
230
268
  if (key.name === "delete") {
231
269
  if (this._cursor < this.userInput.length) {
232
- this.userInput = `${this.userInput.slice(0, this._cursor)}${this.userInput.slice(this._cursor + 1)}`;
233
- this.emit("userInput", this.userInput);
270
+ this.setUserInput(`${before}${after.slice(graphemes(after)[0]?.length ?? 0)}`);
234
271
  }
235
272
  return;
236
273
  }
237
274
  if (!char || char < " " || key.ctrl) {
238
275
  return;
239
276
  }
240
- this.userInput = `${this.userInput.slice(0, this._cursor)}${char}${this.userInput.slice(this._cursor)}`;
241
277
  this._cursor += char.length;
242
- this.emit("userInput", this.userInput);
278
+ this.setUserInput(`${before}${char}${after}`);
243
279
  }
244
280
  render = () => {
245
281
  if (this.closed) {
@@ -267,10 +303,10 @@ export class Prompt extends EventEmitter {
267
303
  }
268
304
  this.closed = true;
269
305
  this.input.removeListener("keypress", this.onKeypress);
306
+ this.input.removeListener("close", this.onCancel);
270
307
  this.output.removeListener("resize", this.render);
271
- if (this.abortListener) {
272
- this.signal?.removeEventListener("abort", this.abortListener);
273
- }
308
+ this.signal?.removeEventListener("abort", this.onCancel);
309
+ this.readlineInterface?.removeListener("close", this.onCancel);
274
310
  this.output.write(`${cursor.show}\n`);
275
311
  if (!process.platform.startsWith("win") && this.input.setRawMode) {
276
312
  this.input.setRawMode(false);
@@ -2,6 +2,7 @@ import { color } from "../../components/color.js";
2
2
  import { GLYPHS, symbol } from "./glyphs.js";
3
3
  import { Prompt } from "./core.js";
4
4
  import { limitOptions } from "./pagination.js";
5
+ import { wrapTextWithPrefix } from "./wrap.js";
5
6
  import { findNonDisabled } from "./select.js";
6
7
  class MultiselectPrompt extends Prompt {
7
8
  options;
@@ -111,7 +112,7 @@ function renderMultiselectPrompt(prompt, opts) {
111
112
  .map((option) => prompt.state === "submit" ? color.dim(option.label) : color.dim.strikethrough(option.label))
112
113
  .join(", ");
113
114
  const end = prompt.state === "submit" ? color.green(GLYPHS.barEnd) : color.red(GLYPHS.barEnd);
114
- return `${color.gray(GLYPHS.barStart)} ${symbol(prompt.state)} ${opts.message}\n${color.gray(GLYPHS.bar)} ${labels}\n${end}`;
115
+ return `${color.gray(GLYPHS.barStart)} ${symbol(prompt.state)} ${opts.message}\n${wrapTextWithPrefix(opts.output ?? process.stdout, labels, `${color.gray(GLYPHS.bar)} `)}\n${end}`;
115
116
  }
116
117
  const lines = limitOptions({
117
118
  cursor: prompt.cursor,
@@ -120,7 +121,7 @@ function renderMultiselectPrompt(prompt, opts) {
120
121
  maxItems: opts.maxItems,
121
122
  columnPadding: 3,
122
123
  style: (option, active) => renderOption(option, prompt.value, active, false, false)
123
- }).map((line) => `${prompt.state === "error" ? color.yellow(GLYPHS.bar) : color.cyan(GLYPHS.bar)} ${line}`);
124
+ }).flatMap((line) => line.split("\n").map((physicalLine) => `${prompt.state === "error" ? color.yellow(GLYPHS.bar) : color.cyan(GLYPHS.bar)} ${physicalLine}`));
124
125
  const body = [`${color.gray(GLYPHS.barStart)} ${symbol(prompt.state)} ${opts.message}`, ...lines];
125
126
  if (prompt.state === "error") {
126
127
  body.push(`${color.yellow(GLYPHS.barEnd)} ${color.yellow(prompt.error)}`);
@@ -5,24 +5,6 @@ import { wrapAnsi } from "fast-wrap-ansi";
5
5
  function countLines(values) {
6
6
  return values.reduce((sum, value) => sum + value.split("\n").length, 0);
7
7
  }
8
- function trimToRows(values, cursorOffset, rows, hasTop, hasBottom) {
9
- const output = [...values];
10
- while (countLines(output) > rows && output.length > 1) {
11
- const removeFromTop = hasTop && cursorOffset > 0;
12
- const removeFromBottom = hasBottom && cursorOffset < output.length - 1;
13
- if (removeFromTop) {
14
- output.shift();
15
- cursorOffset -= 1;
16
- }
17
- else if (removeFromBottom) {
18
- output.pop();
19
- }
20
- else {
21
- output.pop();
22
- }
23
- }
24
- return output;
25
- }
26
8
  export function limitOptions(opts) {
27
9
  const { cursor, options, style, output, maxItems = Number.POSITIVE_INFINITY, columnPadding = 0, rowPadding = 4 } = opts;
28
10
  if (options.length === 0) {
@@ -36,17 +18,29 @@ export function limitOptions(opts) {
36
18
  if (cursor >= cappedVisibleCount - 3) {
37
19
  start = Math.max(Math.min(cursor - cappedVisibleCount + 3, options.length - cappedVisibleCount), 0);
38
20
  }
39
- const hasTopMarker = cappedVisibleCount < options.length && start > 0;
40
- const hasBottomMarker = cappedVisibleCount < options.length && start + cappedVisibleCount < options.length;
21
+ let end = start + cappedVisibleCount;
41
22
  const visible = options
42
- .slice(start, start + cappedVisibleCount)
23
+ .slice(start, end)
43
24
  .map((option, index) => wrapAnsi(style(option, start + index === cursor), columns, { hard: true, trim: false }));
44
- const trimmed = trimToRows(visible, Math.max(cursor - start, 0), Math.max(rowBudget - Number(hasTopMarker) - Number(hasBottomMarker), 1), hasTopMarker, hasBottomMarker);
45
- if (hasTopMarker) {
46
- trimmed.unshift(color.dim(GLYPHS.ellipsis));
25
+ const marker = wrapAnsi(color.dim(GLYPHS.ellipsis), columns, { hard: true, trim: false });
26
+ const markerRows = marker.split("\n").length;
27
+ while (visible.length > 1 && countLines(visible) + markerRows * (Number(start > 0) + Number(end < options.length)) > rowBudget) {
28
+ if (start < cursor) {
29
+ visible.shift();
30
+ start += 1;
31
+ }
32
+ else {
33
+ visible.pop();
34
+ end -= 1;
35
+ }
36
+ }
37
+ let remainingRows = rowBudget - countLines(visible);
38
+ if (start > 0 && remainingRows >= markerRows) {
39
+ visible.unshift(marker);
40
+ remainingRows -= markerRows;
47
41
  }
48
- if (hasBottomMarker) {
49
- trimmed.push(color.dim(GLYPHS.ellipsis));
42
+ if (end < options.length && remainingRows >= markerRows) {
43
+ visible.push(marker);
50
44
  }
51
- return trimmed;
45
+ return visible;
52
46
  }
@@ -1,6 +1,8 @@
1
1
  import { color } from "../../components/color.js";
2
+ import { graphemes } from "../../dashboard/terminal-width.js";
2
3
  import { GLYPHS, symbol, symbolBar } from "./glyphs.js";
3
4
  import { Prompt } from "./core.js";
5
+ import { wrapTextWithPrefix } from "./wrap.js";
4
6
  class PasswordPrompt extends Prompt {
5
7
  mask;
6
8
  constructor(opts) {
@@ -15,16 +17,17 @@ class PasswordPrompt extends Prompt {
15
17
  this.on("userInput", (value) => this.setValue(value));
16
18
  }
17
19
  get masked() {
18
- return this.mask.repeat(this.userInput.length);
20
+ return this.mask.repeat(graphemes(this.userInput).length);
19
21
  }
20
22
  get userInputWithCursor() {
21
23
  if (this.state === "submit") {
22
24
  return this.masked;
23
25
  }
24
26
  const masked = this.masked;
25
- const before = masked.slice(0, this.cursor);
26
- const current = masked[this.cursor];
27
- const after = masked.slice(this.cursor + 1);
27
+ const maskCursor = graphemes(this.userInput.slice(0, this.cursor)).length * this.mask.length;
28
+ const before = masked.slice(0, maskCursor);
29
+ const current = masked.slice(maskCursor, maskCursor + this.mask.length);
30
+ const after = masked.slice(maskCursor + this.mask.length);
28
31
  if (current) {
29
32
  return `${before}${color.inverse(current)}${after}`;
30
33
  }
@@ -40,15 +43,15 @@ function renderHeader(prompt, message) {
40
43
  function renderPasswordPrompt(prompt, opts) {
41
44
  const value = prompt.masked;
42
45
  if (prompt.state === "submit") {
43
- return `${renderHeader(prompt, opts.message)}\n${color.gray(GLYPHS.bar)} ${color.dim(value)}\n${color.green(GLYPHS.barEnd)}`;
46
+ return `${renderHeader(prompt, opts.message)}\n${wrapTextWithPrefix(opts.output ?? process.stdout, color.dim(value), `${color.gray(GLYPHS.bar)} `)}\n${color.green(GLYPHS.barEnd)}`;
44
47
  }
45
48
  if (prompt.state === "cancel") {
46
- return `${renderHeader(prompt, opts.message)}\n${color.gray(GLYPHS.bar)} ${color.dim.strikethrough(value)}\n${color.red(GLYPHS.barEnd)}`;
49
+ return `${renderHeader(prompt, opts.message)}\n${wrapTextWithPrefix(opts.output ?? process.stdout, color.dim.strikethrough(value), `${color.gray(GLYPHS.bar)} `)}\n${color.red(GLYPHS.barEnd)}`;
47
50
  }
48
51
  if (prompt.state === "error") {
49
- return `${renderHeader(prompt, opts.message)}\n${symbolBar(prompt.state)} ${prompt.userInputWithCursor}\n${color.yellow(GLYPHS.barEnd)} ${color.yellow(prompt.error)}`;
52
+ return `${renderHeader(prompt, opts.message)}\n${wrapTextWithPrefix(opts.output ?? process.stdout, prompt.userInputWithCursor, `${symbolBar(prompt.state)} `)}\n${color.yellow(GLYPHS.barEnd)} ${color.yellow(prompt.error)}`;
50
53
  }
51
- return `${renderHeader(prompt, opts.message)}\n${symbolBar(prompt.state)} ${prompt.userInputWithCursor}\n${color.cyan(GLYPHS.barEnd)}`;
54
+ return `${renderHeader(prompt, opts.message)}\n${wrapTextWithPrefix(opts.output ?? process.stdout, prompt.userInputWithCursor, `${symbolBar(prompt.state)} `)}\n${color.cyan(GLYPHS.barEnd)}`;
52
55
  }
53
56
  export function passwordPrompt(opts) {
54
57
  return new PasswordPrompt(opts).prompt();
@@ -2,6 +2,7 @@ import { color } from "../../components/color.js";
2
2
  import { GLYPHS, symbol } from "./glyphs.js";
3
3
  import { Prompt } from "./core.js";
4
4
  import { limitOptions } from "./pagination.js";
5
+ import { wrapTextWithPrefix } from "./wrap.js";
5
6
  class SelectPrompt extends Prompt {
6
7
  options;
7
8
  constructor(opts) {
@@ -72,7 +73,7 @@ function renderSelectPrompt(prompt, opts) {
72
73
  const option = prompt.visibleOptions[prompt.cursor];
73
74
  const rendered = option ? renderOption(option, false, prompt.state === "submit", prompt.state === "cancel") : "";
74
75
  const end = prompt.state === "submit" ? color.green(GLYPHS.barEnd) : color.red(GLYPHS.barEnd);
75
- return `${color.gray(GLYPHS.barStart)} ${symbol(prompt.state)} ${opts.message}\n${color.gray(GLYPHS.bar)} ${rendered}\n${end}`;
76
+ return `${color.gray(GLYPHS.barStart)} ${symbol(prompt.state)} ${opts.message}\n${wrapTextWithPrefix(opts.output ?? process.stdout, rendered, `${color.gray(GLYPHS.bar)} `)}\n${end}`;
76
77
  }
77
78
  const lines = limitOptions({
78
79
  cursor: prompt.cursor,
@@ -81,7 +82,7 @@ function renderSelectPrompt(prompt, opts) {
81
82
  maxItems: opts.maxItems,
82
83
  columnPadding: 3,
83
84
  style: (option, active) => renderOption(option, active, false, false)
84
- }).map((line) => `${color.cyan(GLYPHS.bar)} ${line}`);
85
+ }).flatMap((line) => line.split("\n").map((physicalLine) => `${color.cyan(GLYPHS.bar)} ${physicalLine}`));
85
86
  return `${color.gray(GLYPHS.barStart)} ${symbol(prompt.state)} ${opts.message}\n${lines.join("\n")}\n${color.cyan(GLYPHS.barEnd)}`;
86
87
  }
87
88
  export function selectPrompt(opts) {
@@ -1,6 +1,8 @@
1
1
  import { color } from "../../components/color.js";
2
+ import { graphemes } from "../../dashboard/terminal-width.js";
2
3
  import { GLYPHS, symbol, symbolBar } from "./glyphs.js";
3
4
  import { Prompt } from "./core.js";
5
+ import { wrapTextWithPrefix } from "./wrap.js";
4
6
  class TextPrompt extends Prompt {
5
7
  constructor(opts) {
6
8
  const initialUserInput = opts.initialValue ?? "";
@@ -9,7 +11,7 @@ class TextPrompt extends Prompt {
9
11
  initialValue: initialUserInput,
10
12
  initialUserInput,
11
13
  render: (prompt) => renderTextPrompt(prompt, opts),
12
- validate: opts.validate
14
+ validate: (value) => opts.validate?.(value || opts.defaultValue || "")
13
15
  });
14
16
  this.on("userInput", (value) => this.setValue(value));
15
17
  this.on("finalize", () => {
@@ -23,8 +25,8 @@ class TextPrompt extends Prompt {
23
25
  return this.userInput;
24
26
  }
25
27
  const before = this.userInput.slice(0, this.cursor);
26
- const current = this.userInput[this.cursor];
27
- const after = this.userInput.slice(this.cursor + 1);
28
+ const current = graphemes(this.userInput.slice(this.cursor))[0];
29
+ const after = this.userInput.slice(this.cursor + (current?.length ?? 0));
28
30
  if (current) {
29
31
  return `${before}${color.inverse(current)}${after}`;
30
32
  }
@@ -40,20 +42,21 @@ function renderHeader(prompt, message) {
40
42
  function renderTextPrompt(prompt, opts) {
41
43
  const value = prompt.value ?? "";
42
44
  if (prompt.state === "submit") {
43
- return `${renderHeader(prompt, opts.message)}\n${color.gray(GLYPHS.bar)} ${color.dim(value)}\n${color.green(GLYPHS.barEnd)}`;
45
+ return `${renderHeader(prompt, opts.message)}\n${wrapTextWithPrefix(opts.output ?? process.stdout, color.dim(value), `${color.gray(GLYPHS.bar)} `)}\n${color.green(GLYPHS.barEnd)}`;
44
46
  }
45
47
  if (prompt.state === "cancel") {
46
- return `${renderHeader(prompt, opts.message)}\n${color.gray(GLYPHS.bar)} ${color.dim.strikethrough(value)}\n${color.red(GLYPHS.barEnd)}`;
48
+ return `${renderHeader(prompt, opts.message)}\n${wrapTextWithPrefix(opts.output ?? process.stdout, color.dim.strikethrough(value), `${color.gray(GLYPHS.bar)} `)}\n${color.red(GLYPHS.barEnd)}`;
47
49
  }
50
+ const [placeholder, ...placeholderRest] = graphemes(opts.placeholder ?? "");
48
51
  const input = prompt.userInput.length > 0
49
52
  ? prompt.userInputWithCursor
50
- : opts.placeholder
51
- ? `${color.inverse(opts.placeholder[0] ?? " ")}${color.dim(opts.placeholder.slice(1))}`
53
+ : placeholder
54
+ ? `${color.inverse(placeholder)}${color.dim(placeholderRest.join(""))}`
52
55
  : color.inverse("_");
53
56
  if (prompt.state === "error") {
54
- return `${renderHeader(prompt, opts.message)}\n${symbolBar(prompt.state)} ${input}\n${color.yellow(GLYPHS.barEnd)} ${color.yellow(prompt.error)}`;
57
+ return `${renderHeader(prompt, opts.message)}\n${wrapTextWithPrefix(opts.output ?? process.stdout, input, `${symbolBar(prompt.state)} `)}\n${color.yellow(GLYPHS.barEnd)} ${color.yellow(prompt.error)}`;
55
58
  }
56
- return `${renderHeader(prompt, opts.message)}\n${symbolBar(prompt.state)} ${input}\n${color.cyan(GLYPHS.barEnd)}`;
59
+ return `${renderHeader(prompt, opts.message)}\n${wrapTextWithPrefix(opts.output ?? process.stdout, input, `${symbolBar(prompt.state)} `)}\n${color.cyan(GLYPHS.barEnd)}`;
57
60
  }
58
61
  export function textPrompt(opts) {
59
62
  return new TextPrompt(opts).prompt();
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "toolcraft-schema",
3
- "version": "0.0.163",
3
+ "version": "0.0.165",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "toolcraft",
3
- "version": "0.0.163",
3
+ "version": "0.0.165",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "main": "dist/index.js",
@@ -158,7 +158,7 @@
158
158
  "yaml"
159
159
  ],
160
160
  "optionalDependencies": {
161
- "toolcraft-schema": "0.0.163",
161
+ "toolcraft-schema": "0.0.165",
162
162
  "toolcraft-design": "*",
163
163
  "@poe-code/frontmatter": "*",
164
164
  "@poe-code/agent-mcp-config": "*",