@usejunior/docx-mcp 0.21.3 → 0.22.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.
package/dist/server.d.ts CHANGED
@@ -1,3 +1,5 @@
1
+ import { Server } from '@modelcontextprotocol/sdk/server/index.js';
2
+ import { type CallToolResult } from '@modelcontextprotocol/sdk/types.js';
1
3
  import { SessionManager } from './session/manager.js';
2
4
  export declare const MCP_TRANSPORT: "stdio";
3
5
  export declare const MCP_TOOLS: {
@@ -12,5 +14,17 @@ export declare const MCP_TOOLS: {
12
14
  emitsNonRevisionChanges: boolean;
13
15
  }[];
14
16
  export declare function dispatchToolCall(sessions: SessionManager, name: string, args: Record<string, unknown>): Promise<Record<string, unknown>>;
17
+ /**
18
+ * Run one tool call and wrap its JSON envelope as an MCP `CallToolResult`.
19
+ *
20
+ * The tool JSON is passed through unchanged (including `success: false` and the
21
+ * error code/message). When the tool reports `success: false`, or throws, the
22
+ * result also carries `isError: true` so MCP clients that branch on the
23
+ * transport-level flag see the failure (#1085). A thrown failure is reported
24
+ * with the standard envelope under code `INTERNAL_ERROR`.
25
+ */
26
+ export declare function handleCallTool(sessions: SessionManager, name: string, args: Record<string, unknown>): Promise<CallToolResult>;
27
+ /** Build the MCP server with its tool handlers, without connecting a transport. */
28
+ export declare function createServer(sessions?: SessionManager): Server;
15
29
  export declare function runServer(): Promise<void>;
16
30
  //# sourceMappingURL=server.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAsC,MAAM,sBAAsB,CAAC;AAoC1F,eAAO,MAAM,aAAa,EAAG,OAAgB,CAAC;AAE9C,eAAO,MAAM,SAAS;;;;;;;;;;GAAsB,CAAC;AA+G7C,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAuHlC;AAED,wBAAsB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAmC/C"}
1
+ {"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAEnE,OAAO,EAGL,KAAK,cAAc,EACpB,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAsC,MAAM,sBAAsB,CAAC;AAqC1F,eAAO,MAAM,aAAa,EAAG,OAAgB,CAAC;AAE9C,eAAO,MAAM,SAAS;;;;;;;;;;GAAsB,CAAC;AA+G7C,wBAAsB,gBAAgB,CACpC,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAuHlC;AAED;;;;;;;;GAQG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,cAAc,EACxB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5B,OAAO,CAAC,cAAc,CAAC,CAiBzB;AAED,mFAAmF;AACnF,wBAAgB,YAAY,CAAC,QAAQ,CAAC,EAAE,cAAc,GAAG,MAAM,CAiC9D;AAED,wBAAsB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC,CAI/C"}
package/dist/server.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import path from 'node:path';
2
2
  import { Server } from '@modelcontextprotocol/sdk/server/index.js';
3
3
  import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
4
- import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js';
4
+ import { CallToolRequestSchema, ListToolsRequestSchema, } from '@modelcontextprotocol/sdk/types.js';
5
5
  import { SessionManager } from './session/manager.js';
6
6
  import { SAFE_DOCX_MCP_TOOLS } from './tool_catalog.js';
7
7
  import { readFile } from './tools/read_file.js';
@@ -36,6 +36,7 @@ import { extractRevisions_tool } from './tools/extract_revisions.js';
36
36
  import { clearFormatting } from './tools/clear_formatting.js';
37
37
  import { resolveGDocsSessionForTool, resolveOdfSessionForTool } from './tools/session_resolution.js';
38
38
  import { checkGDocsSupport, checkOdfSupport } from './tools/provider_guard.js';
39
+ import { errorMessage } from './error_utils.js';
39
40
  export const MCP_TRANSPORT = 'stdio';
40
41
  export const MCP_TOOLS = SAFE_DOCX_MCP_TOOLS;
41
42
  function isGDocsRequest(args) {
@@ -282,7 +283,36 @@ export async function dispatchToolCall(sessions, name, args) {
282
283
  };
283
284
  }
284
285
  }
285
- export async function runServer() {
286
+ /**
287
+ * Run one tool call and wrap its JSON envelope as an MCP `CallToolResult`.
288
+ *
289
+ * The tool JSON is passed through unchanged (including `success: false` and the
290
+ * error code/message). When the tool reports `success: false`, or throws, the
291
+ * result also carries `isError: true` so MCP clients that branch on the
292
+ * transport-level flag see the failure (#1085). A thrown failure is reported
293
+ * with the standard envelope under code `INTERNAL_ERROR`.
294
+ */
295
+ export async function handleCallTool(sessions, name, args) {
296
+ let result;
297
+ try {
298
+ result = await dispatchToolCall(sessions, name, args);
299
+ }
300
+ catch (e) {
301
+ result = {
302
+ success: false,
303
+ error: { code: 'INTERNAL_ERROR', message: errorMessage(e) },
304
+ };
305
+ }
306
+ // MCP SDK expects tool results as content blocks.
307
+ const callResult = {
308
+ content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
309
+ };
310
+ if (result.success === false)
311
+ callResult.isError = true;
312
+ return callResult;
313
+ }
314
+ /** Build the MCP server with its tool handlers, without connecting a transport. */
315
+ export function createServer(sessions) {
286
316
  const server = new Server({ name: 'safe-docx', version: '0.2.0' }, {
287
317
  capabilities: {
288
318
  tools: {},
@@ -292,21 +322,25 @@ export async function runServer() {
292
322
  // Configurable via SAFE_DOCX_AI_AUTHOR env var; defaults to "SafeDocX".
293
323
  // Set to empty string explicitly to disable tracked emission and fall back
294
324
  // to legacy untracked behavior.
295
- const aiAuthorEnv = process.env.SAFE_DOCX_AI_AUTHOR;
296
- const defaultAiAuthor = aiAuthorEnv === '' ? null : (aiAuthorEnv ?? 'SafeDocX');
297
- const sessions = new SessionManager({ defaultAiAuthor });
325
+ let manager = sessions;
326
+ if (!manager) {
327
+ const aiAuthorEnv = process.env.SAFE_DOCX_AI_AUTHOR;
328
+ const defaultAiAuthor = aiAuthorEnv === '' ? null : (aiAuthorEnv ?? 'SafeDocX');
329
+ manager = new SessionManager({ defaultAiAuthor });
330
+ }
331
+ const activeSessions = manager;
298
332
  server.setRequestHandler(ListToolsRequestSchema, async () => {
299
333
  return { tools: MCP_TOOLS };
300
334
  });
301
335
  server.setRequestHandler(CallToolRequestSchema, async (req) => {
302
336
  const { name } = req.params;
303
337
  const args = (req.params.arguments ?? {});
304
- const result = await dispatchToolCall(sessions, name, args);
305
- // MCP SDK expects tool results as content blocks.
306
- return {
307
- content: [{ type: 'text', text: JSON.stringify(result, null, 2) }],
308
- };
338
+ return await handleCallTool(activeSessions, name, args);
309
339
  });
340
+ return server;
341
+ }
342
+ export async function runServer() {
343
+ const server = createServer();
310
344
  const transport = new StdioServerTransport();
311
345
  await server.connect(transport);
312
346
  }
@@ -1 +1 @@
1
- {"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"accept_ai_edits.d.ts","sourceRoot":"","sources":["../../src/tools/accept_ai_edits.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD,OAAO,EAAW,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAIxD;;;GAGG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE;IACN,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,GACA,OAAO,CAAC,YAAY,CAAC,CAmDvB"}
1
+ {"version":3,"file":"accept_ai_edits.d.ts","sourceRoot":"","sources":["../../src/tools/accept_ai_edits.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD,OAAO,EAAW,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAIxD;;;GAGG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE;IACN,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,GACA,OAAO,CAAC,YAAY,CAAC,CA0DvB"}
@@ -22,22 +22,28 @@ export async function acceptAiEdits(manager, params) {
22
22
  author: params.author,
23
23
  normalizeFirst: params.normalize_first,
24
24
  });
25
- // A selector that resolved nothing must not look like an edit (#1084).
26
- if (revisionResultChangedDocument(result))
25
+ // A selector that resolved nothing must not look like an edit (#1084), and
26
+ // a call that changed nothing has nothing to persist: it records no
27
+ // selective action (which would make a later clean save fail with
28
+ // SELECTIVE_REVISIONS_WOULD_BE_DISCARDED) and echoes no ids as selected.
29
+ // The result counts are what prove a change; selectedIds lists only the
30
+ // requested ids that named a revision present in the document (#1099).
31
+ const changed = revisionResultChangedDocument(result);
32
+ const effectiveIds = changed ? selectedIds : [];
33
+ if (changed) {
27
34
  manager.markEdited(session);
28
- if (selectedIds.length > 0) {
29
35
  manager.recordSelectiveRevisionAction(session, {
30
36
  tool: 'accept_ai_edits',
31
37
  selector: hasIds ? 'revision_ids' : 'author',
32
- selectedRevisionIds: selectedIds,
38
+ selectedRevisionIds: effectiveIds,
33
39
  });
34
40
  }
35
41
  return ok(mergeSessionResolutionMetadata({
36
42
  ...result,
37
- selected_revision_ids: selectedIds,
43
+ selected_revision_ids: effectiveIds,
38
44
  file_path: manager.normalizePath(session.originalPath),
39
- persistence_required: selectedIds.length > 0,
40
- ...(selectedIds.length > 0
45
+ persistence_required: changed,
46
+ ...(changed
41
47
  ? { next_step: "Call save with save_format='tracked' or 'both' to persist this session-scoped mutation." }
42
48
  : {}),
43
49
  }, metadata));
@@ -1 +1 @@
1
- {"version":3,"file":"accept_ai_edits.js","sourceRoot":"","sources":["../../src/tools/accept_ai_edits.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,8BAA8B,EAAE,MAAM,yBAAyB,CAAC;AAChG,OAAO,EAAE,EAAE,EAAE,GAAG,EAAqB,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,6BAA6B,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,6BAA6B,EAAE,MAAM,sBAAsB,CAAC;AAErE;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAuB,EACvB,MAKC;IAED,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC,CAAC;IAC/F,IAAI,CAAC,QAAQ,CAAC,EAAE;QAAE,OAAO,QAAQ,CAAC,QAAQ,CAAC;IAC3C,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;IAEvC,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC;IACpF,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,IAAI,MAAM,CAAC,MAAM,KAAK,EAAE,CAAC,EAAE,CAAC;QAC/D,OAAO,GAAG,CACR,mBAAmB,EACnB,iCAAiC,EACjC,4FAA4F,CAC7F,CAAC;IACJ,CAAC;IAED,IAAI,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;YAC9D,WAAW,EAAE,MAAM,CAAC,YAAY;YAChC,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,cAAc,EAAE,MAAM,CAAC,eAAe;SACvC,CAAC,CAAC;QACH,uEAAuE;QACvE,IAAI,6BAA6B,CAAC,MAAM,CAAC;YAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACvE,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,OAAO,CAAC,6BAA6B,CAAC,OAAO,EAAE;gBAC7C,IAAI,EAAE,iBAAiB;gBACvB,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ;gBAC5C,mBAAmB,EAAE,WAAW;aACjC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,EAAE,CAAC,8BAA8B,CAAC;YACvC,GAAG,MAAM;YACT,qBAAqB,EAAE,WAAW;YAClC,SAAS,EAAE,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC;YACtD,oBAAoB,EAAE,WAAW,CAAC,MAAM,GAAG,CAAC;YAC5C,GAAG,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC;gBACxB,CAAC,CAAC,EAAE,SAAS,EAAE,yFAAyF,EAAE;gBAC1G,CAAC,CAAC,EAAE,CAAC;SACR,EAAE,QAAQ,CAAC,CAAC,CAAC;IAChB,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QACpB,IAAI,CAAC,YAAY,6BAA6B,EAAE,CAAC;YAC/C,OAAO;gBACL,GAAG,GAAG,CACJ,4BAA4B,EAC5B,CAAC,CAAC,OAAO,EACT,iGAAiG,CAClG;gBACD,QAAQ,EAAE,CAAC,CAAC,QAAQ;aACrB,CAAC;QACJ,CAAC;QACD,OAAO,GAAG,CAAC,uBAAuB,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IACvD,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"accept_ai_edits.js","sourceRoot":"","sources":["../../src/tools/accept_ai_edits.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,8BAA8B,EAAE,MAAM,yBAAyB,CAAC;AAChG,OAAO,EAAE,EAAE,EAAE,GAAG,EAAqB,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,6BAA6B,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,6BAA6B,EAAE,MAAM,sBAAsB,CAAC;AAErE;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAuB,EACvB,MAKC;IAED,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC,CAAC;IAC/F,IAAI,CAAC,QAAQ,CAAC,EAAE;QAAE,OAAO,QAAQ,CAAC,QAAQ,CAAC;IAC3C,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;IAEvC,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC;IACpF,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,IAAI,MAAM,CAAC,MAAM,KAAK,EAAE,CAAC,EAAE,CAAC;QAC/D,OAAO,GAAG,CACR,mBAAmB,EACnB,iCAAiC,EACjC,4FAA4F,CAC7F,CAAC;IACJ,CAAC;IAED,IAAI,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;YAC9D,WAAW,EAAE,MAAM,CAAC,YAAY;YAChC,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,cAAc,EAAE,MAAM,CAAC,eAAe;SACvC,CAAC,CAAC;QACH,2EAA2E;QAC3E,oEAAoE;QACpE,kEAAkE;QAClE,yEAAyE;QACzE,wEAAwE;QACxE,uEAAuE;QACvE,MAAM,OAAO,GAAG,6BAA6B,CAAC,MAAM,CAAC,CAAC;QACtD,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;QAChD,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC5B,OAAO,CAAC,6BAA6B,CAAC,OAAO,EAAE;gBAC7C,IAAI,EAAE,iBAAiB;gBACvB,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ;gBAC5C,mBAAmB,EAAE,YAAY;aAClC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,EAAE,CAAC,8BAA8B,CAAC;YACvC,GAAG,MAAM;YACT,qBAAqB,EAAE,YAAY;YACnC,SAAS,EAAE,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC;YACtD,oBAAoB,EAAE,OAAO;YAC7B,GAAG,CAAC,OAAO;gBACT,CAAC,CAAC,EAAE,SAAS,EAAE,yFAAyF,EAAE;gBAC1G,CAAC,CAAC,EAAE,CAAC;SACR,EAAE,QAAQ,CAAC,CAAC,CAAC;IAChB,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QACpB,IAAI,CAAC,YAAY,6BAA6B,EAAE,CAAC;YAC/C,OAAO;gBACL,GAAG,GAAG,CACJ,4BAA4B,EAC5B,CAAC,CAAC,OAAO,EACT,iGAAiG,CAClG;gBACD,QAAQ,EAAE,CAAC,CAAC,QAAQ;aACrB,CAAC;QACJ,CAAC;QACD,OAAO,GAAG,CAAC,uBAAuB,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IACvD,CAAC;AACH,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"grep.d.ts","sourceRoot":"","sources":["../../../src/tools/gdocs/grep.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE7E,OAAO,EAAW,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAYzD,wBAAsB,SAAS,CAC7B,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE;IACN,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,EACD,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,OAAO,CAAC,YAAY,CAAC,CAiHvB"}
1
+ {"version":3,"file":"grep.d.ts","sourceRoot":"","sources":["../../../src/tools/gdocs/grep.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE7E,OAAO,EAAW,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAYzD,wBAAsB,SAAS,CAC7B,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,YAAY,EACrB,MAAM,EAAE;IACN,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,EACD,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,OAAO,CAAC,YAAY,CAAC,CAqHvB"}
@@ -23,7 +23,7 @@ export async function gdocsGrep(manager, session, params, metadata) {
23
23
  re = new RegExp(patternStr, caseSensitive ? 'g' : 'gi');
24
24
  }
25
25
  catch (e) {
26
- return ok({ patterns, total_matches: 0, matches: [], error: `Invalid regex pattern: ${errorMessage(e)}` });
26
+ return err('INVALID_PATTERN', `Invalid regex pattern: ${errorMessage(e)}`, 'Patterns are regular expressions; escape metacharacters such as ( [ . * to match them literally.');
27
27
  }
28
28
  const paragraphs = session.doc.getParagraphs();
29
29
  const matches = [];
@@ -1 +1 @@
1
- {"version":3,"file":"grep.js","sourceRoot":"","sources":["../../../src/tools/gdocs/grep.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"grep.js","sourceRoot":"","sources":["../../../src/tools/gdocs/grep.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"grep.d.ts","sourceRoot":"","sources":["../../src/tools/grep.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EAAW,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAoDxD,wBAAsB,IAAI,CACxB,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE;IACN,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,GACA,OAAO,CAAC,YAAY,CAAC,CA6GvB"}
1
+ {"version":3,"file":"grep.d.ts","sourceRoot":"","sources":["../../src/tools/grep.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EAAW,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAoDxD,wBAAsB,IAAI,CACxB,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE;IACN,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,GACA,OAAO,CAAC,YAAY,CAAC,CA4GvB"}
@@ -60,12 +60,7 @@ export async function grep(manager, params) {
60
60
  re = new RegExp(patternStr, caseSensitive ? 'g' : 'gi');
61
61
  }
62
62
  catch (e) {
63
- return ok({
64
- patterns,
65
- total_matches: 0,
66
- matches: [],
67
- error: `Invalid regex pattern: ${errorMessage(e)}`,
68
- });
63
+ return err('INVALID_PATTERN', `Invalid regex pattern: ${errorMessage(e)}`, 'Patterns are regular expressions; escape metacharacters such as ( [ . * to match them literally.');
69
64
  }
70
65
  // Multi-file stateless mode
71
66
  const filePaths = params.file_paths;
@@ -1 +1 @@
1
- {"version":3,"file":"grep.js","sourceRoot":"","sources":["../../src/tools/grep.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"grep.js","sourceRoot":"","sources":["../../src/tools/grep.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAElE,OAAO,EAAa,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,GAAG,EAAE,EAAE,EAAqB,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,8BAA8B,EAAE,qBAAqB,EAAE,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAC7H,OAAO,EAAE,0BAA0B,EAAE,MAAM,0BAA0B,CAAC;AACtE,OAAO,EACL,oBAAoB,EACpB,gBAAgB,GAGjB,MAAM,gBAAgB,CAAC;AAExB,8EAA8E;AAC9E,0EAA0E;AAC1E,8EAA8E;AAE9E,SAAS,gBAAgB,CACvB,GAAiB,EACjB,EAAU,EACV,IAKC;IAED,MAAM,UAAU,GAAG,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC;IAE/C,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,CAAC,cAAc,EAAE,CAAC;IAC5C,MAAM,KAAK,GAAG,UAAiD,CAAC;IAEhE,IAAI,WAAW,GAAgC,IAAI,CAAC;IACpD,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAC,iBAAiB,CAAC,EAAE,mBAAmB,EAAE,IAAI,EAAE,CAAC,CAAC;QACvE,WAAW,GAAG,IAAI,GAAG,CACnB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,UAAU,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC,CAAC,CACrF,CAAC;IACJ,CAAC;IAED,OAAO,oBAAoB,CAAC,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;AAC5D,CAAC;AAED,SAAS,YAAY,CACnB,GAAiB,EACjB,EAAU,EACV,IAAkD;IAElD,OAAO,gBAAgB,CAAC,YAAY,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;AAC7E,CAAC;AAED,8EAA8E;AAC9E,iBAAiB;AACjB,8EAA8E;AAE9E,MAAM,CAAC,KAAK,UAAU,IAAI,CACxB,OAAuB,EACvB,MAYC;IAED,IAAI,CAAC;QACH,uEAAuE;QACvE,IAAI,QAAQ,GAAG,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC;QACrC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YAChE,QAAQ,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC;QACD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAO,GAAG,CACR,iBAAiB,EACjB,8BAA8B,EAC9B,+DAA+D,CAChE,CAAC;QACJ,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,CAAC,cAAc,IAAI,KAAK,CAAC;QACrD,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,IAAI,KAAK,CAAC;QAC7C,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,IAAI,GAAG,CAAC;QAC7C,MAAM,YAAY,GAAG,MAAM,CAAC,aAAa,IAAI,EAAE,CAAC;QAChD,MAAM,iBAAiB,GAAG,MAAM,CAAC,mBAAmB,IAAI,IAAI,CAAC;QAC7D,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,IAAI,KAAK,CAAC;QAC7C,MAAM,cAAc,GAAG,MAAM,CAAC,eAAe,IAAI,IAAI,CAAC;QAEtD,4EAA4E;QAC5E,qEAAqE;QACrE,0EAA0E;QAC1E,yDAAyD;QACzD,MAAM,YAAY,GAAG,EAAE,CAAC;QACxB,MAAM,2BAA2B,GAAG,IAAI,CAAC;QACzC,IAAI,QAAQ,CAAC,MAAM,GAAG,YAAY,EAAE,CAAC;YACnC,OAAO,GAAG,CACR,wBAAwB,EACxB,sBAAsB,QAAQ,CAAC,MAAM,SAAS,YAAY,IAAI,EAC9D,4CAA4C,YAAY,YAAY,CACrE,CAAC;QACJ,CAAC;QACD,MAAM,qBAAqB,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAC7E,IAAI,qBAAqB,GAAG,2BAA2B,EAAE,CAAC;YACxD,OAAO,GAAG,CACR,wBAAwB,EACxB,2BAA2B,qBAAqB,YAAY,2BAA2B,cAAc,EACrG,gCAAgC,CACjC,CAAC;QACJ,CAAC;QAED,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,OAAO,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;QAC3F,IAAI,EAAU,CAAC;QACf,IAAI,CAAC;YACH,EAAE,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC1D,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACpB,OAAO,GAAG,CACR,iBAAiB,EACjB,0BAA0B,YAAY,CAAC,CAAC,CAAC,EAAE,EAC3C,kGAAkG,CACnG,CAAC;QACJ,CAAC;QAED,4BAA4B;QAC5B,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC;QACpC,IAAI,SAAS,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtC,OAAO,MAAM,aAAa,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE;gBACjD,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,iBAAiB,EAAE,SAAS,EAAE,cAAc;aACjF,CAAC,CAAC;QACL,CAAC;QAED,2BAA2B;QAC3B,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QACpF,IAAI,CAAC,QAAQ,CAAC,EAAE;YAAE,OAAO,QAAQ,CAAC,QAAQ,CAAC;QAC3C,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;QAEvC,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAC;YAC9E,OAAO,EAAE,CAAC,8BAA8B,CAAC;gBACvC,SAAS,EAAE,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC;gBACtD,QAAQ;gBACR,UAAU,EAAE,IAAI;gBAChB,aAAa,EAAE,SAAS,CAAC,YAAY;gBACrC,OAAO,EAAE,SAAS,CAAC,OAAO;gBAC1B,gBAAgB,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM;gBAC1C,iBAAiB,EAAE,SAAS,CAAC,gBAAgB;aAC9C,EAAE,QAAQ,CAAC,CAAC,CAAC;QAChB,CAAC;QAED,MAAM,MAAM,GAAG,gBAAgB,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE;YAC/C,UAAU,EAAE,YAAY,EAAE,iBAAiB,EAAE,cAAc;SAC5D,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,8BAA8B,CAAC;YAC9C,SAAS,EAAE,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC;YACtD,QAAQ;YACR,mBAAmB,EAAE,iBAAiB;YACtC,aAAa,EAAE,MAAM,CAAC,YAAY;YAClC,uBAAuB,EAAE,MAAM,CAAC,qBAAqB;YACrD,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,gBAAgB,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM;YACvC,mBAAmB,EAAE,UAAU;YAC/B,iBAAiB,EAAE,MAAM,CAAC,gBAAgB;SAC3C,EAAE,QAAQ,CAA4B,CAAC;QACxC,IAAI,MAAM,CAAC,gBAAgB,EAAE,CAAC;YAC5B,QAAQ,CAAC,eAAe,GAAG,iBAAiB;gBAC1C,CAAC,CAAC,8KAA8K;gBAChL,CAAC,CAAC,6IAA6I,CAAC;QACpJ,CAAC;QACD,OAAO,EAAE,CAAC,QAAQ,CAAC,CAAC;IACtB,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QACpB,MAAM,GAAG,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QAC5B,OAAO,GAAG,CAAC,cAAc,EAAE,8BAA8B,GAAG,EAAE,EAAE,+CAA+C,CAAC,CAAC;IACnH,CAAC;AACH,CAAC;AAED,8EAA8E;AAC9E,8BAA8B;AAC9B,8EAA8E;AAE9E,KAAK,UAAU,aAAa,CAC1B,OAAuB,EACvB,SAAmB,EACnB,EAAU,EACV,IAOC;IAED,MAAM,KAAK,GAAmC,EAAE,CAAC;IACjD,IAAI,iBAAiB,GAAG,CAAC,CAAC;IAC1B,IAAI,oBAAoB,GAAG,CAAC,CAAC;IAE7B,iEAAiE;IACjE,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,MAAM,2BAA2B,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC9D,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;YACf,KAAK,CAAC,IAAI,CAAC;gBACT,SAAS,EAAE,EAAE;gBACb,KAAK,EAAG,MAAM,CAAC,QAA6C,CAAC,KAAK,EAAE,OAAO,IAAI,gBAAgB;gBAC/F,OAAO,EAAE,EAAE;gBACX,aAAa,EAAE,CAAC;aACjB,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QAED,IAAI,GAAiB,CAAC;QACtB,IAAI,CAAC;YACH,GAAG,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAChD,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACpB,MAAM,OAAO,GAAG,0BAA0B,CAAC,CAAC,CAAC,CAAC;YAC9C,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO;gBAAE,MAAM,CAAC,CAAC;YACzC,KAAK,CAAC,IAAI,CAAC;gBACT,SAAS,EAAE,MAAM,CAAC,cAAc;gBAChC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO;gBAC5B,UAAU,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI;gBAC9B,OAAO,EAAE,EAAE;gBACX,aAAa,EAAE,CAAC;aACjB,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QACD,GAAG,CAAC,SAAS,EAAE,CAAC;QAChB,GAAG,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;QAEtC,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,EAAE,CAAC,SAAS,GAAG,CAAC,CAAC;YACjB,MAAM,SAAS,GAAG,YAAY,CAAC,GAAG,EAAE,EAAE,EAAE;gBACtC,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;aAChC,CAAC,CAAC;YACH,iBAAiB,IAAI,SAAS,CAAC,YAAY,CAAC;YAC5C,KAAK,CAAC,IAAI,CAAC;gBACT,SAAS,EAAE,MAAM,CAAC,cAAc;gBAChC,UAAU,EAAE,IAAI;gBAChB,aAAa,EAAE,SAAS,CAAC,YAAY;gBACrC,OAAO,EAAE,SAAS,CAAC,OAAO;gBAC1B,iBAAiB,EAAE,SAAS,CAAC,gBAAgB;aAC9C,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,EAAE,CAAC,SAAS,GAAG,CAAC,CAAC;YACjB,MAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,EAAE,EAAE,EAAE;gBACvC,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;gBACzC,cAAc,EAAE,IAAI,CAAC,cAAc;aACpC,CAAC,CAAC;YACH,iBAAiB,IAAI,MAAM,CAAC,YAAY,CAAC;YACzC,oBAAoB,IAAI,MAAM,CAAC,qBAAqB,CAAC;YACrD,KAAK,CAAC,IAAI,CAAC;gBACT,SAAS,EAAE,MAAM,CAAC,cAAc;gBAChC,aAAa,EAAE,MAAM,CAAC,YAAY;gBAClC,uBAAuB,EAAE,MAAM,CAAC,qBAAqB;gBACrD,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,iBAAiB,EAAE,MAAM,CAAC,gBAAgB;aAC3C,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,EAAE,CAAC;QACR,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,IAAI,EAAE,YAAY;QAClB,cAAc,EAAE,SAAS,CAAC,MAAM;QAChC,aAAa,EAAE,iBAAiB;QAChC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,6BAA6B,EAAE,oBAAoB,EAAE,CAAC;QAClF,KAAK;KACN,CAAC,CAAC;AACL,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"grep.d.ts","sourceRoot":"","sources":["../../../src/tools/odf/grep.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE3E,OAAO,EAAW,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAGzD;;;;;GAKG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE;IACN,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,EACD,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,OAAO,CAAC,YAAY,CAAC,CAkFvB"}
1
+ {"version":3,"file":"grep.d.ts","sourceRoot":"","sources":["../../../src/tools/odf/grep.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,UAAU,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE3E,OAAO,EAAW,KAAK,YAAY,EAAE,MAAM,aAAa,CAAC;AAGzD;;;;;GAKG;AACH,wBAAsB,OAAO,CAC3B,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,UAAU,EACnB,MAAM,EAAE;IACN,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,EACD,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,OAAO,CAAC,YAAY,CAAC,CA8EvB"}
@@ -28,15 +28,7 @@ export async function odfGrep(manager, session, params, metadata) {
28
28
  re = new RegExp(patternStr, caseSensitive ? 'g' : 'gi');
29
29
  }
30
30
  catch (e) {
31
- return ok({
32
- file_path: session.originalPath,
33
- provider: 'odf',
34
- patterns,
35
- total_matches: 0,
36
- matches: [],
37
- error: `Invalid regex pattern: ${errorMessage(e)}`,
38
- ...metadata,
39
- });
31
+ return err('INVALID_PATTERN', `Invalid regex pattern: ${errorMessage(e)}`, 'Patterns are regular expressions; escape metacharacters such as ( [ . * to match them literally.');
40
32
  }
41
33
  if (searchXml) {
42
34
  const xmlResult = searchRawXmlCore(session.doc.toXml(), re, { maxResults, contextChars });
@@ -1 +1 @@
1
- {"version":3,"file":"grep.js","sourceRoot":"","sources":["../../../src/tools/odf/grep.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"grep.js","sourceRoot":"","sources":["../../../src/tools/odf/grep.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"reject_ai_edits.d.ts","sourceRoot":"","sources":["../../src/tools/reject_ai_edits.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD,OAAO,EAAW,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAIxD;;;;GAIG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE;IACN,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,GACA,OAAO,CAAC,YAAY,CAAC,CAmDvB"}
1
+ {"version":3,"file":"reject_ai_edits.d.ts","sourceRoot":"","sources":["../../src/tools/reject_ai_edits.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAGvD,OAAO,EAAW,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAIxD;;;;GAIG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE;IACN,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,GACA,OAAO,CAAC,YAAY,CAAC,CA0DvB"}
@@ -23,22 +23,28 @@ export async function rejectAiEdits(manager, params) {
23
23
  author: params.author,
24
24
  normalizeFirst: params.normalize_first,
25
25
  });
26
- // A selector that resolved nothing must not look like an edit (#1084).
27
- if (revisionResultChangedDocument(result))
26
+ // A selector that resolved nothing must not look like an edit (#1084), and
27
+ // a call that changed nothing has nothing to persist: it records no
28
+ // selective action (which would make a later clean save fail with
29
+ // SELECTIVE_REVISIONS_WOULD_BE_DISCARDED) and echoes no ids as selected.
30
+ // The result counts are what prove a change; selectedIds lists only the
31
+ // requested ids that named a revision present in the document (#1099).
32
+ const changed = revisionResultChangedDocument(result);
33
+ const effectiveIds = changed ? selectedIds : [];
34
+ if (changed) {
28
35
  manager.markEdited(session);
29
- if (selectedIds.length > 0) {
30
36
  manager.recordSelectiveRevisionAction(session, {
31
37
  tool: 'reject_ai_edits',
32
38
  selector: hasIds ? 'revision_ids' : 'author',
33
- selectedRevisionIds: selectedIds,
39
+ selectedRevisionIds: effectiveIds,
34
40
  });
35
41
  }
36
42
  return ok(mergeSessionResolutionMetadata({
37
43
  ...result,
38
- selected_revision_ids: selectedIds,
44
+ selected_revision_ids: effectiveIds,
39
45
  file_path: manager.normalizePath(session.originalPath),
40
- persistence_required: selectedIds.length > 0,
41
- ...(selectedIds.length > 0
46
+ persistence_required: changed,
47
+ ...(changed
42
48
  ? { next_step: "Call save with save_format='tracked' or 'both' to persist this session-scoped mutation." }
43
49
  : {}),
44
50
  }, metadata));
@@ -1 +1 @@
1
- {"version":3,"file":"reject_ai_edits.js","sourceRoot":"","sources":["../../src/tools/reject_ai_edits.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,8BAA8B,EAAE,MAAM,yBAAyB,CAAC;AAChG,OAAO,EAAE,EAAE,EAAE,GAAG,EAAqB,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,6BAA6B,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,6BAA6B,EAAE,MAAM,sBAAsB,CAAC;AAErE;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAuB,EACvB,MAKC;IAED,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC,CAAC;IAC/F,IAAI,CAAC,QAAQ,CAAC,EAAE;QAAE,OAAO,QAAQ,CAAC,QAAQ,CAAC;IAC3C,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;IAEvC,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC;IACpF,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,IAAI,MAAM,CAAC,MAAM,KAAK,EAAE,CAAC,EAAE,CAAC;QAC/D,OAAO,GAAG,CACR,mBAAmB,EACnB,iCAAiC,EACjC,4FAA4F,CAC7F,CAAC;IACJ,CAAC;IAED,IAAI,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;YAC9D,WAAW,EAAE,MAAM,CAAC,YAAY;YAChC,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,cAAc,EAAE,MAAM,CAAC,eAAe;SACvC,CAAC,CAAC;QACH,uEAAuE;QACvE,IAAI,6BAA6B,CAAC,MAAM,CAAC;YAAE,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QACvE,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,OAAO,CAAC,6BAA6B,CAAC,OAAO,EAAE;gBAC7C,IAAI,EAAE,iBAAiB;gBACvB,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ;gBAC5C,mBAAmB,EAAE,WAAW;aACjC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,EAAE,CAAC,8BAA8B,CAAC;YACvC,GAAG,MAAM;YACT,qBAAqB,EAAE,WAAW;YAClC,SAAS,EAAE,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC;YACtD,oBAAoB,EAAE,WAAW,CAAC,MAAM,GAAG,CAAC;YAC5C,GAAG,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC;gBACxB,CAAC,CAAC,EAAE,SAAS,EAAE,yFAAyF,EAAE;gBAC1G,CAAC,CAAC,EAAE,CAAC;SACR,EAAE,QAAQ,CAAC,CAAC,CAAC;IAChB,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QACpB,IAAI,CAAC,YAAY,6BAA6B,EAAE,CAAC;YAC/C,OAAO;gBACL,GAAG,GAAG,CACJ,4BAA4B,EAC5B,CAAC,CAAC,OAAO,EACT,iGAAiG,CAClG;gBACD,QAAQ,EAAE,CAAC,CAAC,QAAQ;aACrB,CAAC;QACJ,CAAC;QACD,OAAO,GAAG,CAAC,uBAAuB,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IACvD,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"reject_ai_edits.js","sourceRoot":"","sources":["../../src/tools/reject_ai_edits.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,8BAA8B,EAAE,MAAM,yBAAyB,CAAC;AAChG,OAAO,EAAE,EAAE,EAAE,GAAG,EAAqB,MAAM,YAAY,CAAC;AACxD,OAAO,EAAE,6BAA6B,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,6BAA6B,EAAE,MAAM,sBAAsB,CAAC;AAErE;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAuB,EACvB,MAKC;IAED,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAC,CAAC;IAC/F,IAAI,CAAC,QAAQ,CAAC,EAAE;QAAE,OAAO,QAAQ,CAAC,QAAQ,CAAC;IAC3C,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;IAEvC,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC;IACpF,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,IAAI,MAAM,CAAC,MAAM,KAAK,EAAE,CAAC,EAAE,CAAC;QAC/D,OAAO,GAAG,CACR,mBAAmB,EACnB,iCAAiC,EACjC,4FAA4F,CAC7F,CAAC;IACJ,CAAC;IAED,IAAI,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;YAC9D,WAAW,EAAE,MAAM,CAAC,YAAY;YAChC,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,cAAc,EAAE,MAAM,CAAC,eAAe;SACvC,CAAC,CAAC;QACH,2EAA2E;QAC3E,oEAAoE;QACpE,kEAAkE;QAClE,yEAAyE;QACzE,wEAAwE;QACxE,uEAAuE;QACvE,MAAM,OAAO,GAAG,6BAA6B,CAAC,MAAM,CAAC,CAAC;QACtD,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;QAChD,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC5B,OAAO,CAAC,6BAA6B,CAAC,OAAO,EAAE;gBAC7C,IAAI,EAAE,iBAAiB;gBACvB,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,QAAQ;gBAC5C,mBAAmB,EAAE,YAAY;aAClC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,EAAE,CAAC,8BAA8B,CAAC;YACvC,GAAG,MAAM;YACT,qBAAqB,EAAE,YAAY;YACnC,SAAS,EAAE,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC;YACtD,oBAAoB,EAAE,OAAO;YAC7B,GAAG,CAAC,OAAO;gBACT,CAAC,CAAC,EAAE,SAAS,EAAE,yFAAyF,EAAE;gBAC1G,CAAC,CAAC,EAAE,CAAC;SACR,EAAE,QAAQ,CAAC,CAAC,CAAC;IAChB,CAAC;IAAC,OAAO,CAAU,EAAE,CAAC;QACpB,IAAI,CAAC,YAAY,6BAA6B,EAAE,CAAC;YAC/C,OAAO;gBACL,GAAG,GAAG,CACJ,4BAA4B,EAC5B,CAAC,CAAC,OAAO,EACT,iGAAiG,CAClG;gBACD,QAAQ,EAAE,CAAC,CAAC,QAAQ;aACrB,CAAC;QACJ,CAAC;QACD,OAAO,GAAG,CAAC,uBAAuB,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IACvD,CAAC;AACH,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"replace_text.d.ts","sourceRoot":"","sources":["../../src/tools/replace_text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAgC,MAAM,uBAAuB,CAAC;AAErF,OAAO,EAAW,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAIxD,OAAO,EAcL,KAAK,eAAe,EACrB,MAAM,sBAAsB,CAAC;AAqF9B,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpD;AA2CD;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAK/D;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAKlF;AAaD,wBAAsB,WAAW,CAC/B,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE;IACN,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC7B,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,0BAA0B,CAAC,EAAE,OAAO,CAAC;CACtC,EACD,GAAG,CAAC,EAAE,eAAe,GACpB,OAAO,CAAC,YAAY,CAAC,CAmKvB"}
1
+ {"version":3,"file":"replace_text.d.ts","sourceRoot":"","sources":["../../src/tools/replace_text.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAgC,MAAM,uBAAuB,CAAC;AAErF,OAAO,EAAW,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAIxD,OAAO,EAcL,KAAK,eAAe,EACrB,MAAM,sBAAsB,CAAC;AAqK9B,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpD;AA2CD;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAK/D;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAKlF;AAaD,wBAAsB,WAAW,CAC/B,OAAO,EAAE,cAAc,EACvB,MAAM,EAAE;IACN,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC7B,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,0BAA0B,CAAC,EAAE,OAAO,CAAC;CACtC,EACD,GAAG,CAAC,EAAE,eAAe,GACpB,OAAO,CAAC,YAAY,CAAC,CAuKvB"}
@@ -33,6 +33,90 @@ function symbolRemovalWarning(removed, tracked) {
33
33
  return `The replaced range spanned ${removed} ${noun} (w:sym, such as a checkbox or bullet) ` +
34
34
  `not shown in the paragraph text; ${removed === 1 ? 'it was' : 'they were'} ${outcome}.`;
35
35
  }
36
+ function insideTrackedDeletion(el, paragraph) {
37
+ for (let node = el.parentNode; node && node !== paragraph; node = node.parentNode) {
38
+ if (node.nodeType === 1 && node.namespaceURI === OOXML.W_NS && node.localName === W.del) {
39
+ return true;
40
+ }
41
+ }
42
+ return false;
43
+ }
44
+ /**
45
+ * Other constructs the paragraph text does not show and a range can take out
46
+ * without the caller having seen them (issue #1097): a field with no result
47
+ * (an `XE` index entry, a `TC` entry, a `PAGE` never updated: complex fields
48
+ * with no `separate` marker) and a footnote or endnote reference. Each is
49
+ * described once, in the order it is closed (a note reference where it sits,
50
+ * a field at its `end` marker, so a nested field precedes the field around
51
+ * it), and a before/after comparison names exactly what the edit removed.
52
+ * Fields with a cached result are left out:
53
+ * their result is in the paragraph text the caller matched, so the caller saw
54
+ * what the range covers. An empty `w:fldSimple` is a zero-length marker the
55
+ * replace primitive keeps in place, so it needs no count.
56
+ */
57
+ function collectLiveHiddenConstructs(paragraph) {
58
+ const labels = [];
59
+ const openFields = [];
60
+ const all = paragraph.getElementsByTagNameNS(OOXML.W_NS, '*');
61
+ for (let i = 0; i < all.length; i++) {
62
+ const el = all[i];
63
+ if (insideTrackedDeletion(el, paragraph))
64
+ continue;
65
+ switch (el.localName) {
66
+ case W.fldChar: {
67
+ const kind = el.getAttributeNS(OOXML.W_NS, 'fldCharType') ?? el.getAttribute('w:fldCharType');
68
+ if (kind === 'begin')
69
+ openFields.push({ instruction: '', separated: false });
70
+ else if (kind === 'separate' && openFields.length > 0)
71
+ openFields[openFields.length - 1].separated = true;
72
+ else if (kind === 'end') {
73
+ const field = openFields.pop();
74
+ if (field && !field.separated)
75
+ labels.push(`field with no result (instruction: ${field.instruction.trim()})`);
76
+ }
77
+ break;
78
+ }
79
+ case W.instrText:
80
+ if (openFields.length > 0)
81
+ openFields[openFields.length - 1].instruction += el.textContent ?? '';
82
+ break;
83
+ case W.footnoteReference:
84
+ case W.endnoteReference: {
85
+ const id = el.getAttributeNS(OOXML.W_NS, 'id') ?? el.getAttribute('w:id') ?? '?';
86
+ labels.push(`${el.localName === W.footnoteReference ? 'footnote' : 'endnote'} reference (note id ${id})`);
87
+ break;
88
+ }
89
+ default:
90
+ break;
91
+ }
92
+ }
93
+ return labels;
94
+ }
95
+ /** Labels present before the edit and missing after it, as a multiset difference. */
96
+ function removedHiddenConstructs(before, after) {
97
+ const remaining = new Map();
98
+ for (const label of after)
99
+ remaining.set(label, (remaining.get(label) ?? 0) + 1);
100
+ const removed = [];
101
+ for (const label of before) {
102
+ const count = remaining.get(label) ?? 0;
103
+ if (count > 0)
104
+ remaining.set(label, count - 1);
105
+ else
106
+ removed.push(label);
107
+ }
108
+ return removed;
109
+ }
110
+ function hiddenConstructRemovalWarning(label, tracked) {
111
+ const outcome = tracked
112
+ ? 'deleted with the replaced text as a tracked change; reject the deletion to restore'
113
+ : 'removed with the replaced text';
114
+ const aftermath = !tracked && /^(?:footnote|endnote) reference/u.test(label)
115
+ ? ' Its note body stays in the notes part, no longer referenced.'
116
+ : '';
117
+ const article = /^[aeiou]/iu.test(label) ? 'an' : 'a';
118
+ return `The replaced range spanned ${article} ${label} not shown in the paragraph text; it was ${outcome}.${aftermath}`;
119
+ }
36
120
  function mergeAddRunProps(a, b) {
37
121
  const out = { ...a };
38
122
  if (b) {
@@ -221,10 +305,14 @@ export async function replaceText(manager, params, ctx) {
221
305
  throw new Error(`Paragraph ID ${pid} not found in document`);
222
306
  }
223
307
  const liveSymbolsBefore = countLiveSymbolCharacters(pEl);
308
+ const hiddenBefore = collectLiveHiddenConstructs(pEl);
224
309
  const reportRemovedSymbols = () => {
225
310
  const removed = liveSymbolsBefore - countLiveSymbolCharacters(pEl);
226
311
  if (removed > 0)
227
312
  editWarnings.push(symbolRemovalWarning(removed, !!activeCtx));
313
+ for (const label of removedHiddenConstructs(hiddenBefore, collectLiveHiddenConstructs(pEl))) {
314
+ editWarnings.push(hiddenConstructRemovalWarning(label, !!activeCtx));
315
+ }
228
316
  };
229
317
  const paraRuns = getParagraphRuns(pEl);
230
318
  const { templateRun: contextTemplateRun, allOverlappedRunsHighlighted } = chooseContextTemplateRun(paraRuns, matchStart, matchEnd);