@mcp-z/mcp-sheets 2.4.2 → 2.5.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 (119) hide show
  1. package/README.md +45 -29
  2. package/dist/cjs/constants.d.cts +26 -0
  3. package/dist/cjs/constants.d.ts +26 -0
  4. package/dist/cjs/constants.js +83 -3
  5. package/dist/cjs/constants.js.map +1 -1
  6. package/dist/cjs/mcp/tools/cells-copy.d.cts +165 -0
  7. package/dist/cjs/mcp/tools/cells-copy.d.ts +165 -0
  8. package/dist/cjs/mcp/tools/cells-copy.js +388 -0
  9. package/dist/cjs/mcp/tools/cells-copy.js.map +1 -0
  10. package/dist/cjs/mcp/tools/cells-format.d.cts +3 -3
  11. package/dist/cjs/mcp/tools/cells-format.d.ts +3 -3
  12. package/dist/cjs/mcp/tools/cells-format.js +3 -2
  13. package/dist/cjs/mcp/tools/cells-format.js.map +1 -1
  14. package/dist/cjs/mcp/tools/columns-get.d.cts +2 -2
  15. package/dist/cjs/mcp/tools/columns-get.d.ts +2 -2
  16. package/dist/cjs/mcp/tools/columns-get.js +2 -1
  17. package/dist/cjs/mcp/tools/columns-get.js.map +1 -1
  18. package/dist/cjs/mcp/tools/columns-update.d.cts +1 -1
  19. package/dist/cjs/mcp/tools/columns-update.d.ts +1 -1
  20. package/dist/cjs/mcp/tools/columns-update.js +3 -2
  21. package/dist/cjs/mcp/tools/columns-update.js.map +1 -1
  22. package/dist/cjs/mcp/tools/index.d.cts +1 -0
  23. package/dist/cjs/mcp/tools/index.d.ts +1 -0
  24. package/dist/cjs/mcp/tools/index.js +4 -0
  25. package/dist/cjs/mcp/tools/index.js.map +1 -1
  26. package/dist/cjs/mcp/tools/rows-append.d.cts +1 -1
  27. package/dist/cjs/mcp/tools/rows-append.d.ts +1 -1
  28. package/dist/cjs/mcp/tools/rows-append.js +2 -1
  29. package/dist/cjs/mcp/tools/rows-append.js.map +1 -1
  30. package/dist/cjs/mcp/tools/rows-csv-append.d.cts +1 -1
  31. package/dist/cjs/mcp/tools/rows-csv-append.d.ts +1 -1
  32. package/dist/cjs/mcp/tools/rows-csv-append.js +2 -1
  33. package/dist/cjs/mcp/tools/rows-csv-append.js.map +1 -1
  34. package/dist/cjs/mcp/tools/rows-get.d.cts +2 -2
  35. package/dist/cjs/mcp/tools/rows-get.d.ts +2 -2
  36. package/dist/cjs/mcp/tools/rows-get.js +2 -1
  37. package/dist/cjs/mcp/tools/rows-get.js.map +1 -1
  38. package/dist/cjs/mcp/tools/values-batch-update.d.cts +1 -1
  39. package/dist/cjs/mcp/tools/values-batch-update.d.ts +1 -1
  40. package/dist/cjs/mcp/tools/values-batch-update.js +3 -2
  41. package/dist/cjs/mcp/tools/values-batch-update.js.map +1 -1
  42. package/dist/cjs/mcp/tools/values-csv-update.d.cts +1 -1
  43. package/dist/cjs/mcp/tools/values-csv-update.d.ts +1 -1
  44. package/dist/cjs/mcp/tools/values-csv-update.js +3 -2
  45. package/dist/cjs/mcp/tools/values-csv-update.js.map +1 -1
  46. package/dist/cjs/mcp/tools/values-search.d.cts +2 -2
  47. package/dist/cjs/mcp/tools/values-search.d.ts +2 -2
  48. package/dist/cjs/mcp/tools/values-search.js +2 -1
  49. package/dist/cjs/mcp/tools/values-search.js.map +1 -1
  50. package/dist/cjs/schemas/index.d.cts +1 -0
  51. package/dist/cjs/schemas/index.d.ts +1 -0
  52. package/dist/cjs/schemas/index.js +16 -0
  53. package/dist/cjs/schemas/index.js.map +1 -1
  54. package/dist/cjs/setup/config.js +26 -14
  55. package/dist/cjs/setup/config.js.map +1 -1
  56. package/dist/cjs/setup/version-help.js +1 -1
  57. package/dist/cjs/setup/version-help.js.map +1 -1
  58. package/dist/cjs/spreadsheet/data-operations.js +60 -181
  59. package/dist/cjs/spreadsheet/data-operations.js.map +1 -1
  60. package/dist/cjs/spreadsheet/range-operations.d.cts +27 -5
  61. package/dist/cjs/spreadsheet/range-operations.d.ts +27 -5
  62. package/dist/cjs/spreadsheet/range-operations.js +48 -28
  63. package/dist/cjs/spreadsheet/range-operations.js.map +1 -1
  64. package/dist/cjs/spreadsheet/sheet-operations.d.cts +6 -0
  65. package/dist/cjs/spreadsheet/sheet-operations.d.ts +6 -0
  66. package/dist/cjs/spreadsheet/sheet-operations.js +114 -124
  67. package/dist/cjs/spreadsheet/sheet-operations.js.map +1 -1
  68. package/dist/esm/constants.d.ts +26 -0
  69. package/dist/esm/constants.js +55 -0
  70. package/dist/esm/constants.js.map +1 -1
  71. package/dist/esm/mcp/tools/cells-copy.d.ts +165 -0
  72. package/dist/esm/mcp/tools/cells-copy.js +190 -0
  73. package/dist/esm/mcp/tools/cells-copy.js.map +1 -0
  74. package/dist/esm/mcp/tools/cells-format.d.ts +3 -3
  75. package/dist/esm/mcp/tools/cells-format.js +3 -2
  76. package/dist/esm/mcp/tools/cells-format.js.map +1 -1
  77. package/dist/esm/mcp/tools/columns-get.d.ts +2 -2
  78. package/dist/esm/mcp/tools/columns-get.js +2 -1
  79. package/dist/esm/mcp/tools/columns-get.js.map +1 -1
  80. package/dist/esm/mcp/tools/columns-update.d.ts +1 -1
  81. package/dist/esm/mcp/tools/columns-update.js +3 -2
  82. package/dist/esm/mcp/tools/columns-update.js.map +1 -1
  83. package/dist/esm/mcp/tools/index.d.ts +1 -0
  84. package/dist/esm/mcp/tools/index.js +1 -0
  85. package/dist/esm/mcp/tools/index.js.map +1 -1
  86. package/dist/esm/mcp/tools/rows-append.d.ts +1 -1
  87. package/dist/esm/mcp/tools/rows-append.js +2 -1
  88. package/dist/esm/mcp/tools/rows-append.js.map +1 -1
  89. package/dist/esm/mcp/tools/rows-csv-append.d.ts +1 -1
  90. package/dist/esm/mcp/tools/rows-csv-append.js +2 -1
  91. package/dist/esm/mcp/tools/rows-csv-append.js.map +1 -1
  92. package/dist/esm/mcp/tools/rows-get.d.ts +2 -2
  93. package/dist/esm/mcp/tools/rows-get.js +2 -1
  94. package/dist/esm/mcp/tools/rows-get.js.map +1 -1
  95. package/dist/esm/mcp/tools/values-batch-update.d.ts +1 -1
  96. package/dist/esm/mcp/tools/values-batch-update.js +3 -2
  97. package/dist/esm/mcp/tools/values-batch-update.js.map +1 -1
  98. package/dist/esm/mcp/tools/values-csv-update.d.ts +1 -1
  99. package/dist/esm/mcp/tools/values-csv-update.js +3 -2
  100. package/dist/esm/mcp/tools/values-csv-update.js.map +1 -1
  101. package/dist/esm/mcp/tools/values-search.d.ts +2 -2
  102. package/dist/esm/mcp/tools/values-search.js +2 -1
  103. package/dist/esm/mcp/tools/values-search.js.map +1 -1
  104. package/dist/esm/schemas/index.d.ts +1 -0
  105. package/dist/esm/schemas/index.js +9 -0
  106. package/dist/esm/schemas/index.js.map +1 -1
  107. package/dist/esm/setup/config.js +26 -14
  108. package/dist/esm/setup/config.js.map +1 -1
  109. package/dist/esm/setup/version-help.js +7 -0
  110. package/dist/esm/setup/version-help.js.map +1 -1
  111. package/dist/esm/spreadsheet/data-operations.js +47 -95
  112. package/dist/esm/spreadsheet/data-operations.js.map +1 -1
  113. package/dist/esm/spreadsheet/range-operations.d.ts +27 -5
  114. package/dist/esm/spreadsheet/range-operations.js +50 -27
  115. package/dist/esm/spreadsheet/range-operations.js.map +1 -1
  116. package/dist/esm/spreadsheet/sheet-operations.d.ts +6 -0
  117. package/dist/esm/spreadsheet/sheet-operations.js +88 -79
  118. package/dist/esm/spreadsheet/sheet-operations.js.map +1 -1
  119. package/package.json +3 -3
@@ -11,6 +11,15 @@ const SHEET_ID_DESC = 'Sheet ID (from URL gid={gid})';
11
11
  // is the default sheet ID in new spreadsheets.
12
12
  export const SpreadsheetIdSchema = z.string().min(1).describe(SPREADSHEET_ID_DESC);
13
13
  export const SheetGidSchema = z.coerce.string().min(1).describe(SHEET_ID_DESC);
14
+ // Strict sheet ID: a non-negative integer number or a string of digits (gid 0 and "0" both work).
15
+ // Unlike SheetGidSchema it does not coerce, so null, undefined, booleans, negatives, decimals and
16
+ // non-digit strings are rejected instead of becoming "null", "undefined", "true", etc.
17
+ // Sheet IDs are int32, so values above 2147483647 are rejected (keeps Number(gid) exact).
18
+ const MAX_SHEET_GID = 2147483647;
19
+ export const StrictSheetGidSchema = z.union([
20
+ z.number().int().nonnegative().max(MAX_SHEET_GID),
21
+ z.string().regex(/^\d+$/, 'Sheet ID must be a non-negative integer').refine((value)=>Number(value) <= MAX_SHEET_GID, `Sheet ID must be at most ${MAX_SHEET_GID}`)
22
+ ]).transform((value)=>String(typeof value === 'number' ? value : Number(value))).describe(SHEET_ID_DESC);
14
23
  // Output schemas (for use in output/response schemas)
15
24
  export const SpreadsheetIdOutput = z.string().describe(SPREADSHEET_ID_DESC);
16
25
  export const SheetGidOutput = z.string().describe(SHEET_ID_DESC);
@@ -1 +1 @@
1
- {"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-sheets/src/schemas/index.ts"],"sourcesContent":["import { z } from 'zod';\n\n// Spreadsheet and sheet reference schemas\nexport const SpreadsheetRefSchema = z.string().min(1).describe('Spreadsheet reference: full URL, exact name, or partial name (not ID - use spreadsheet-find to get ID)');\n\nexport const SheetRefSchema = z.string().min(1).describe('Sheet reference: exact title or partial name match (not ID - use sheet-find to get ID)');\n\n// Shared descriptions for consistency\nconst SPREADSHEET_ID_DESC = 'Spreadsheet ID (from URL d/{id})';\nconst SHEET_ID_DESC = 'Sheet ID (from URL gid={gid})';\n\n// Input schemas (with validation)\n// Note: z.coerce.string() converts numbers to strings, handling cases where MCP clients\n// pass gid: 0 (number) instead of gid: \"0\" (string). This is critical for gid=0 which\n// is the default sheet ID in new spreadsheets.\nexport const SpreadsheetIdSchema = z.string().min(1).describe(SPREADSHEET_ID_DESC);\nexport const SheetGidSchema = z.coerce.string().min(1).describe(SHEET_ID_DESC);\n\n// Output schemas (for use in output/response schemas)\nexport const SpreadsheetIdOutput = z.string().describe(SPREADSHEET_ID_DESC);\nexport const SheetGidOutput = z.string().describe(SHEET_ID_DESC);\n\n// Schema for individual sheet cells (can be string, number, boolean, or null)\n// null represents empty cells - JSON cannot represent undefined, and Google API uses null for empty cells\n// Infinity values are allowed as Google Sheets can contain them, but NaN is still rejected\nexport const SheetCellSchema = z.union([z.string(), z.number(), z.literal(Infinity), z.literal(-Infinity), z.boolean(), z.null()]);\n\n// Schema for a row in a sheet search result\nexport const SheetRowSchema = z.object({\n rowIndex: z.number().int().positive().describe('1-based row number in the sheet'),\n values: z.array(SheetCellSchema).optional().describe('Cell values for this row (included when includeData=true)'),\n range: z.string().optional().describe('A1 notation range for this row (e.g., A5:D5)'),\n});\n\n// A1 notation validation - simplified for zod compatibility\nexport const A1NotationSchema = z.string().min(1).describe('A1 notation for cell range (e.g., A1, A1:B2, A:B, 1:2)');\n"],"names":["z","SpreadsheetRefSchema","string","min","describe","SheetRefSchema","SPREADSHEET_ID_DESC","SHEET_ID_DESC","SpreadsheetIdSchema","SheetGidSchema","coerce","SpreadsheetIdOutput","SheetGidOutput","SheetCellSchema","union","number","literal","Infinity","boolean","null","SheetRowSchema","object","rowIndex","int","positive","values","array","optional","range","A1NotationSchema"],"mappings":"AAAA,SAASA,CAAC,QAAQ,MAAM;AAExB,0CAA0C;AAC1C,OAAO,MAAMC,uBAAuBD,EAAEE,MAAM,GAAGC,GAAG,CAAC,GAAGC,QAAQ,CAAC,0GAA0G;AAEzK,OAAO,MAAMC,iBAAiBL,EAAEE,MAAM,GAAGC,GAAG,CAAC,GAAGC,QAAQ,CAAC,0FAA0F;AAEnJ,sCAAsC;AACtC,MAAME,sBAAsB;AAC5B,MAAMC,gBAAgB;AAEtB,kCAAkC;AAClC,wFAAwF;AACxF,sFAAsF;AACtF,+CAA+C;AAC/C,OAAO,MAAMC,sBAAsBR,EAAEE,MAAM,GAAGC,GAAG,CAAC,GAAGC,QAAQ,CAACE,qBAAqB;AACnF,OAAO,MAAMG,iBAAiBT,EAAEU,MAAM,CAACR,MAAM,GAAGC,GAAG,CAAC,GAAGC,QAAQ,CAACG,eAAe;AAE/E,sDAAsD;AACtD,OAAO,MAAMI,sBAAsBX,EAAEE,MAAM,GAAGE,QAAQ,CAACE,qBAAqB;AAC5E,OAAO,MAAMM,iBAAiBZ,EAAEE,MAAM,GAAGE,QAAQ,CAACG,eAAe;AAEjE,8EAA8E;AAC9E,0GAA0G;AAC1G,2FAA2F;AAC3F,OAAO,MAAMM,kBAAkBb,EAAEc,KAAK,CAAC;IAACd,EAAEE,MAAM;IAAIF,EAAEe,MAAM;IAAIf,EAAEgB,OAAO,CAACC;IAAWjB,EAAEgB,OAAO,CAAC,CAACC;IAAWjB,EAAEkB,OAAO;IAAIlB,EAAEmB,IAAI;CAAG,EAAE;AAEnI,4CAA4C;AAC5C,OAAO,MAAMC,iBAAiBpB,EAAEqB,MAAM,CAAC;IACrCC,UAAUtB,EAAEe,MAAM,GAAGQ,GAAG,GAAGC,QAAQ,GAAGpB,QAAQ,CAAC;IAC/CqB,QAAQzB,EAAE0B,KAAK,CAACb,iBAAiBc,QAAQ,GAAGvB,QAAQ,CAAC;IACrDwB,OAAO5B,EAAEE,MAAM,GAAGyB,QAAQ,GAAGvB,QAAQ,CAAC;AACxC,GAAG;AAEH,4DAA4D;AAC5D,OAAO,MAAMyB,mBAAmB7B,EAAEE,MAAM,GAAGC,GAAG,CAAC,GAAGC,QAAQ,CAAC,0DAA0D"}
1
+ {"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-sheets/src/schemas/index.ts"],"sourcesContent":["import { z } from 'zod';\n\n// Spreadsheet and sheet reference schemas\nexport const SpreadsheetRefSchema = z.string().min(1).describe('Spreadsheet reference: full URL, exact name, or partial name (not ID - use spreadsheet-find to get ID)');\n\nexport const SheetRefSchema = z.string().min(1).describe('Sheet reference: exact title or partial name match (not ID - use sheet-find to get ID)');\n\n// Shared descriptions for consistency\nconst SPREADSHEET_ID_DESC = 'Spreadsheet ID (from URL d/{id})';\nconst SHEET_ID_DESC = 'Sheet ID (from URL gid={gid})';\n\n// Input schemas (with validation)\n// Note: z.coerce.string() converts numbers to strings, handling cases where MCP clients\n// pass gid: 0 (number) instead of gid: \"0\" (string). This is critical for gid=0 which\n// is the default sheet ID in new spreadsheets.\nexport const SpreadsheetIdSchema = z.string().min(1).describe(SPREADSHEET_ID_DESC);\nexport const SheetGidSchema = z.coerce.string().min(1).describe(SHEET_ID_DESC);\n\n// Strict sheet ID: a non-negative integer number or a string of digits (gid 0 and \"0\" both work).\n// Unlike SheetGidSchema it does not coerce, so null, undefined, booleans, negatives, decimals and\n// non-digit strings are rejected instead of becoming \"null\", \"undefined\", \"true\", etc.\n// Sheet IDs are int32, so values above 2147483647 are rejected (keeps Number(gid) exact).\nconst MAX_SHEET_GID = 2147483647;\nexport const StrictSheetGidSchema = z\n .union([\n z.number().int().nonnegative().max(MAX_SHEET_GID),\n z\n .string()\n .regex(/^\\d+$/, 'Sheet ID must be a non-negative integer')\n .refine((value) => Number(value) <= MAX_SHEET_GID, `Sheet ID must be at most ${MAX_SHEET_GID}`),\n ])\n .transform((value) => String(typeof value === 'number' ? value : Number(value)))\n .describe(SHEET_ID_DESC);\n\n// Output schemas (for use in output/response schemas)\nexport const SpreadsheetIdOutput = z.string().describe(SPREADSHEET_ID_DESC);\nexport const SheetGidOutput = z.string().describe(SHEET_ID_DESC);\n\n// Schema for individual sheet cells (can be string, number, boolean, or null)\n// null represents empty cells - JSON cannot represent undefined, and Google API uses null for empty cells\n// Infinity values are allowed as Google Sheets can contain them, but NaN is still rejected\nexport const SheetCellSchema = z.union([z.string(), z.number(), z.literal(Infinity), z.literal(-Infinity), z.boolean(), z.null()]);\n\n// Schema for a row in a sheet search result\nexport const SheetRowSchema = z.object({\n rowIndex: z.number().int().positive().describe('1-based row number in the sheet'),\n values: z.array(SheetCellSchema).optional().describe('Cell values for this row (included when includeData=true)'),\n range: z.string().optional().describe('A1 notation range for this row (e.g., A5:D5)'),\n});\n\n// A1 notation validation - simplified for zod compatibility\nexport const A1NotationSchema = z.string().min(1).describe('A1 notation for cell range (e.g., A1, A1:B2, A:B, 1:2)');\n"],"names":["z","SpreadsheetRefSchema","string","min","describe","SheetRefSchema","SPREADSHEET_ID_DESC","SHEET_ID_DESC","SpreadsheetIdSchema","SheetGidSchema","coerce","MAX_SHEET_GID","StrictSheetGidSchema","union","number","int","nonnegative","max","regex","refine","value","Number","transform","String","SpreadsheetIdOutput","SheetGidOutput","SheetCellSchema","literal","Infinity","boolean","null","SheetRowSchema","object","rowIndex","positive","values","array","optional","range","A1NotationSchema"],"mappings":"AAAA,SAASA,CAAC,QAAQ,MAAM;AAExB,0CAA0C;AAC1C,OAAO,MAAMC,uBAAuBD,EAAEE,MAAM,GAAGC,GAAG,CAAC,GAAGC,QAAQ,CAAC,0GAA0G;AAEzK,OAAO,MAAMC,iBAAiBL,EAAEE,MAAM,GAAGC,GAAG,CAAC,GAAGC,QAAQ,CAAC,0FAA0F;AAEnJ,sCAAsC;AACtC,MAAME,sBAAsB;AAC5B,MAAMC,gBAAgB;AAEtB,kCAAkC;AAClC,wFAAwF;AACxF,sFAAsF;AACtF,+CAA+C;AAC/C,OAAO,MAAMC,sBAAsBR,EAAEE,MAAM,GAAGC,GAAG,CAAC,GAAGC,QAAQ,CAACE,qBAAqB;AACnF,OAAO,MAAMG,iBAAiBT,EAAEU,MAAM,CAACR,MAAM,GAAGC,GAAG,CAAC,GAAGC,QAAQ,CAACG,eAAe;AAE/E,kGAAkG;AAClG,kGAAkG;AAClG,uFAAuF;AACvF,0FAA0F;AAC1F,MAAMI,gBAAgB;AACtB,OAAO,MAAMC,uBAAuBZ,EACjCa,KAAK,CAAC;IACLb,EAAEc,MAAM,GAAGC,GAAG,GAAGC,WAAW,GAAGC,GAAG,CAACN;IACnCX,EACGE,MAAM,GACNgB,KAAK,CAAC,SAAS,2CACfC,MAAM,CAAC,CAACC,QAAUC,OAAOD,UAAUT,eAAe,CAAC,yBAAyB,EAAEA,eAAe;CACjG,EACAW,SAAS,CAAC,CAACF,QAAUG,OAAO,OAAOH,UAAU,WAAWA,QAAQC,OAAOD,SACvEhB,QAAQ,CAACG,eAAe;AAE3B,sDAAsD;AACtD,OAAO,MAAMiB,sBAAsBxB,EAAEE,MAAM,GAAGE,QAAQ,CAACE,qBAAqB;AAC5E,OAAO,MAAMmB,iBAAiBzB,EAAEE,MAAM,GAAGE,QAAQ,CAACG,eAAe;AAEjE,8EAA8E;AAC9E,0GAA0G;AAC1G,2FAA2F;AAC3F,OAAO,MAAMmB,kBAAkB1B,EAAEa,KAAK,CAAC;IAACb,EAAEE,MAAM;IAAIF,EAAEc,MAAM;IAAId,EAAE2B,OAAO,CAACC;IAAW5B,EAAE2B,OAAO,CAAC,CAACC;IAAW5B,EAAE6B,OAAO;IAAI7B,EAAE8B,IAAI;CAAG,EAAE;AAEnI,4CAA4C;AAC5C,OAAO,MAAMC,iBAAiB/B,EAAEgC,MAAM,CAAC;IACrCC,UAAUjC,EAAEc,MAAM,GAAGC,GAAG,GAAGmB,QAAQ,GAAG9B,QAAQ,CAAC;IAC/C+B,QAAQnC,EAAEoC,KAAK,CAACV,iBAAiBW,QAAQ,GAAGjC,QAAQ,CAAC;IACrDkC,OAAOtC,EAAEE,MAAM,GAAGmC,QAAQ,GAAGjC,QAAQ,CAAC;AACxC,GAAG;AAEH,4DAA4D;AAC5D,OAAO,MAAMmC,mBAAmBvC,EAAEE,MAAM,GAAGC,GAAG,CAAC,GAAGC,QAAQ,CAAC,0DAA0D"}
@@ -6,6 +6,7 @@ import { parseArgs } from 'util';
6
6
  import { GOOGLE_SCOPE } from '../constants.js';
7
7
  import { readPkg } from './version-help.js';
8
8
  const pkg = readPkg();
9
+ const SERVER_NAME = pkg.name.replace(/^@[^/]+\//, '');
9
10
  // @mcp-z/oauth-google and @mcp-z/server are requireable at the >=20 floor; deferred so
10
11
  // --version/--help (handled via version-help.ts, never this file) load neither package.
11
12
  const _require = typeof require === 'undefined' ? Module.createRequire(import.meta.url) : require;
@@ -67,22 +68,11 @@ const _require = typeof require === 'undefined' ? Module.createRequire(import.me
67
68
  strict: false,
68
69
  allowPositionals: true
69
70
  });
70
- const name = pkg.name.replace(/^@[^/]+\//, '');
71
+ const name = SERVER_NAME;
71
72
  // Parse repository URL from package.json, stripping git+ prefix and .git suffix
72
73
  const rawRepoUrl = typeof pkg.repository === 'object' ? pkg.repository.url : pkg.repository;
73
74
  const repositoryUrl = (_ref = rawRepoUrl === null || rawRepoUrl === void 0 ? void 0 : rawRepoUrl.replace(/^git\+/, '').replace(/\.git$/, '')) !== null && _ref !== void 0 ? _ref : `https://github.com/mcp-z/${name}`;
74
- let rootDir = homedir();
75
- try {
76
- const configPath = mcpServer.findConfigPath({
77
- config: '.mcp.json',
78
- cwd: process.cwd(),
79
- stopDir: homedir()
80
- });
81
- rootDir = path.dirname(configPath);
82
- } catch {
83
- rootDir = homedir();
84
- }
85
- const baseDir = path.join(rootDir, '.mcp-z');
75
+ const baseDir = resolveBaseDir();
86
76
  const cliLogLevel = typeof values['log-level'] === 'string' ? values['log-level'] : undefined;
87
77
  const envLogLevel = env.LOG_LEVEL;
88
78
  const logLevel = (_ref1 = cliLogLevel !== null && cliLogLevel !== void 0 ? cliLogLevel : envLogLevel) !== null && _ref1 !== void 0 ? _ref1 : 'info';
@@ -123,9 +113,31 @@ function normalizeResourceStoreUri(resourceStoreUri) {
123
113
  const expandedPath = resourceStoreUri.startsWith('~') ? resourceStoreUri.replace(/^~/, homedir()) : resourceStoreUri;
124
114
  return pathToFileURL(path.resolve(expandedPath)).href;
125
115
  }
116
+ /** The server's data directory: `.mcp-z` beside the nearest .mcp.json (searched from cwd up to home), else in the home directory. */ function resolveBaseDir() {
117
+ const mcpServer = _require('@mcp-z/server');
118
+ try {
119
+ const configPath = mcpServer.findConfigPath({
120
+ config: '.mcp.json',
121
+ cwd: process.cwd(),
122
+ stopDir: homedir()
123
+ });
124
+ return path.join(path.dirname(configPath), '.mcp-z');
125
+ } catch {
126
+ return path.join(homedir(), '.mcp-z');
127
+ }
128
+ }
126
129
  /**
127
130
  * Build production configuration from process globals.
128
131
  * Entry point for production server.
129
132
  */ export function createConfig() {
130
- return parseConfig(process.argv, process.env);
133
+ const mcpServer = _require('@mcp-z/server');
134
+ const envResult = mcpServer.loadServerEnv({
135
+ name: SERVER_NAME,
136
+ baseDir: resolveBaseDir()
137
+ });
138
+ try {
139
+ return parseConfig(process.argv, process.env);
140
+ } catch (error) {
141
+ throw new Error(`${error.message}\n${mcpServer.formatServerEnvSearch(envResult)}`);
142
+ }
131
143
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-sheets/src/setup/config.ts"],"sourcesContent":["import { fileURLToPath, pathToFileURL } from 'node:url';\nimport type * as OAuthGoogle from '@mcp-z/oauth-google';\nimport type * as McpServer from '@mcp-z/server';\nimport { Module } from 'module';\nimport { homedir } from 'os';\nimport * as path from 'path';\nimport { parseArgs } from 'util';\nimport { GOOGLE_SCOPE } from '../constants.ts';\nimport type { ServerConfig } from '../types.ts';\nimport { readPkg } from './version-help.ts';\n\nconst pkg = readPkg();\n\n// @mcp-z/oauth-google and @mcp-z/server are requireable at the >=20 floor; deferred so\n// --version/--help (handled via version-help.ts, never this file) load neither package.\nconst _require = typeof require === 'undefined' ? Module.createRequire(import.meta.url) : require;\n\n/**\n * Parse Sheets server configuration from CLI arguments and environment.\n *\n * CLI Arguments (all optional):\n * - --auth=<mode> Authentication mode (default: loopback-oauth)\n * Modes: loopback-oauth, service-account, dcr\n * - --headless Disable browser auto-open, return auth URL instead\n * - --redirect-uri=<uri> OAuth redirect URI (default: ephemeral loopback)\n * - --dcr-mode=<mode> DCR mode (self-hosted or external, default: self-hosted)\n * - --dcr-verify-url=<url> External verification endpoint (required for external mode)\n * - --dcr-store-uri=<uri> DCR client storage URI (required for self-hosted mode)\n * - --port=<port> Enable HTTP transport on specified port\n * - --stdio Enable stdio transport (default if no port)\n * - --log-level=<level> Logging level (default: info)\n * - --resource-store-uri=<uri> Resource store URI for CSV file storage (default: file://~/.mcp-z/mcp-sheets/files)\n * - --base-url=<url> Base URL for HTTP file serving (optional)\n *\n * Environment Variables:\n * - GOOGLE_CLIENT_ID OAuth client ID (REQUIRED)\n * - GOOGLE_CLIENT_SECRET OAuth client secret (optional)\n * - AUTH_MODE Default authentication mode (optional)\n * - HEADLESS Disable browser auto-open (optional)\n * - DCR_MODE DCR mode (optional, same format as --dcr-mode)\n * - DCR_VERIFY_URL External verification URL (optional, same as --dcr-verify-url)\n * - DCR_STORE_URI DCR storage URI (optional, same as --dcr-store-uri)\n * - TOKEN_STORE_URI Token storage URI (optional)\n * - PORT Default HTTP port (optional)\n * - LOG_LEVEL Default logging level (optional)\n * - RESOURCE_STORE_URI Resource store URI (optional, file://)\n * - BASE_URL Base URL for HTTP file serving (optional)\n *\n * OAuth Scopes (from constants.ts):\n * openid https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/spreadsheets https://www.googleapis.com/auth/drive\n */\nexport function parseConfig(args: string[], env: Record<string, string | undefined>): ServerConfig {\n const oauthGoogle = _require('@mcp-z/oauth-google') as typeof OAuthGoogle;\n const mcpServer = _require('@mcp-z/server') as typeof McpServer;\n\n const transportConfig = mcpServer.parseConfig(args, env);\n const oauthConfig = oauthGoogle.parseConfig(args, env);\n\n // Parse DCR configuration if DCR mode is enabled\n const dcrConfig = oauthConfig.auth === 'dcr' ? oauthGoogle.parseDcrConfig(args, env, GOOGLE_SCOPE) : undefined;\n\n // Parse application-level config (LOG_LEVEL, RESOURCE_STORE_URI, BASE_URL)\n const { values } = parseArgs({\n args,\n options: {\n 'log-level': { type: 'string' },\n 'base-url': { type: 'string' },\n 'resource-store-uri': { type: 'string' },\n },\n strict: false, // Allow other arguments\n allowPositionals: true,\n });\n\n const name = pkg.name.replace(/^@[^/]+\\//, '');\n // Parse repository URL from package.json, stripping git+ prefix and .git suffix\n const rawRepoUrl = typeof pkg.repository === 'object' ? pkg.repository.url : pkg.repository;\n const repositoryUrl = rawRepoUrl?.replace(/^git\\+/, '').replace(/\\.git$/, '') ?? `https://github.com/mcp-z/${name}`;\n let rootDir = homedir();\n try {\n const configPath = mcpServer.findConfigPath({ config: '.mcp.json', cwd: process.cwd(), stopDir: homedir() });\n rootDir = path.dirname(configPath);\n } catch {\n rootDir = homedir();\n }\n const baseDir = path.join(rootDir, '.mcp-z');\n const cliLogLevel = typeof values['log-level'] === 'string' ? values['log-level'] : undefined;\n const envLogLevel = env.LOG_LEVEL;\n const logLevel = cliLogLevel ?? envLogLevel ?? 'info';\n\n // Parse storage configuration\n const cliResourceStoreUri = typeof values['resource-store-uri'] === 'string' ? values['resource-store-uri'] : undefined;\n const envResourceStoreUri = env.RESOURCE_STORE_URI;\n const defaultResourceStorePath = path.join(baseDir, name, 'files');\n const resourceStoreUri = normalizeResourceStoreUri(cliResourceStoreUri ?? envResourceStoreUri ?? defaultResourceStorePath);\n\n const cliBaseUrl = typeof values['base-url'] === 'string' ? values['base-url'] : undefined;\n const envBaseUrl = env.BASE_URL;\n const baseUrl = cliBaseUrl ?? envBaseUrl;\n\n // Combine configs\n return {\n ...oauthConfig, // Includes clientId, auth, headless, redirectUri\n transport: transportConfig.transport,\n logLevel,\n baseDir,\n name,\n version: pkg.version,\n repositoryUrl,\n resourceStoreUri,\n ...(baseUrl && { baseUrl }),\n ...(dcrConfig && { dcrConfig }),\n };\n}\n\nfunction normalizeResourceStoreUri(resourceStoreUri: string): string {\n const filePrefix = 'file://';\n if (resourceStoreUri.startsWith(filePrefix)) {\n const rawPath = resourceStoreUri.slice(filePrefix.length);\n const filePath = rawPath.startsWith('~') ? rawPath.replace(/^~/, homedir()) : rawPath.startsWith('/') ? fileURLToPath(resourceStoreUri) : rawPath;\n return pathToFileURL(path.resolve(filePath)).href;\n }\n\n if (resourceStoreUri.includes('://')) return resourceStoreUri;\n\n const expandedPath = resourceStoreUri.startsWith('~') ? resourceStoreUri.replace(/^~/, homedir()) : resourceStoreUri;\n return pathToFileURL(path.resolve(expandedPath)).href;\n}\n\n/**\n * Build production configuration from process globals.\n * Entry point for production server.\n */\nexport function createConfig(): ServerConfig {\n return parseConfig(process.argv, process.env);\n}\n"],"names":["fileURLToPath","pathToFileURL","Module","homedir","path","parseArgs","GOOGLE_SCOPE","readPkg","pkg","_require","require","createRequire","url","parseConfig","args","env","cliLogLevel","cliResourceStoreUri","oauthGoogle","mcpServer","transportConfig","oauthConfig","dcrConfig","auth","parseDcrConfig","undefined","values","options","type","strict","allowPositionals","name","replace","rawRepoUrl","repository","repositoryUrl","rootDir","configPath","findConfigPath","config","cwd","process","stopDir","dirname","baseDir","join","envLogLevel","LOG_LEVEL","logLevel","envResourceStoreUri","RESOURCE_STORE_URI","defaultResourceStorePath","resourceStoreUri","normalizeResourceStoreUri","cliBaseUrl","envBaseUrl","BASE_URL","baseUrl","transport","version","filePrefix","startsWith","rawPath","slice","length","filePath","resolve","href","includes","expandedPath","createConfig","argv"],"mappings":"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"}
1
+ {"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-sheets/src/setup/config.ts"],"sourcesContent":["import { fileURLToPath, pathToFileURL } from 'node:url';\nimport type * as OAuthGoogle from '@mcp-z/oauth-google';\nimport type * as McpServer from '@mcp-z/server';\nimport { Module } from 'module';\nimport { homedir } from 'os';\nimport * as path from 'path';\nimport { parseArgs } from 'util';\nimport { GOOGLE_SCOPE } from '../constants.ts';\nimport type { ServerConfig } from '../types.ts';\nimport { readPkg } from './version-help.ts';\n\nconst pkg = readPkg();\nconst SERVER_NAME = pkg.name.replace(/^@[^/]+\\//, '');\n\n// @mcp-z/oauth-google and @mcp-z/server are requireable at the >=20 floor; deferred so\n// --version/--help (handled via version-help.ts, never this file) load neither package.\nconst _require = typeof require === 'undefined' ? Module.createRequire(import.meta.url) : require;\n\n/**\n * Parse Sheets server configuration from CLI arguments and environment.\n *\n * CLI Arguments (all optional):\n * - --auth=<mode> Authentication mode (default: loopback-oauth)\n * Modes: loopback-oauth, service-account, dcr\n * - --headless Disable browser auto-open, return auth URL instead\n * - --redirect-uri=<uri> OAuth redirect URI (default: ephemeral loopback)\n * - --dcr-mode=<mode> DCR mode (self-hosted or external, default: self-hosted)\n * - --dcr-verify-url=<url> External verification endpoint (required for external mode)\n * - --dcr-store-uri=<uri> DCR client storage URI (required for self-hosted mode)\n * - --port=<port> Enable HTTP transport on specified port\n * - --stdio Enable stdio transport (default if no port)\n * - --log-level=<level> Logging level (default: info)\n * - --resource-store-uri=<uri> Resource store URI for CSV file storage (default: file://~/.mcp-z/mcp-sheets/files)\n * - --base-url=<url> Base URL for HTTP file serving (optional)\n *\n * Environment Variables:\n * - GOOGLE_CLIENT_ID OAuth client ID (REQUIRED)\n * - GOOGLE_CLIENT_SECRET OAuth client secret (optional)\n * - AUTH_MODE Default authentication mode (optional)\n * - HEADLESS Disable browser auto-open (optional)\n * - DCR_MODE DCR mode (optional, same format as --dcr-mode)\n * - DCR_VERIFY_URL External verification URL (optional, same as --dcr-verify-url)\n * - DCR_STORE_URI DCR storage URI (optional, same as --dcr-store-uri)\n * - TOKEN_STORE_URI Token storage URI (optional)\n * - PORT Default HTTP port (optional)\n * - LOG_LEVEL Default logging level (optional)\n * - RESOURCE_STORE_URI Resource store URI (optional, file://)\n * - BASE_URL Base URL for HTTP file serving (optional)\n *\n * OAuth Scopes (from constants.ts):\n * openid https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/spreadsheets https://www.googleapis.com/auth/drive\n */\nexport function parseConfig(args: string[], env: Record<string, string | undefined>): ServerConfig {\n const oauthGoogle = _require('@mcp-z/oauth-google') as typeof OAuthGoogle;\n const mcpServer = _require('@mcp-z/server') as typeof McpServer;\n\n const transportConfig = mcpServer.parseConfig(args, env);\n const oauthConfig = oauthGoogle.parseConfig(args, env);\n\n // Parse DCR configuration if DCR mode is enabled\n const dcrConfig = oauthConfig.auth === 'dcr' ? oauthGoogle.parseDcrConfig(args, env, GOOGLE_SCOPE) : undefined;\n\n // Parse application-level config (LOG_LEVEL, RESOURCE_STORE_URI, BASE_URL)\n const { values } = parseArgs({\n args,\n options: {\n 'log-level': { type: 'string' },\n 'base-url': { type: 'string' },\n 'resource-store-uri': { type: 'string' },\n },\n strict: false, // Allow other arguments\n allowPositionals: true,\n });\n\n const name = SERVER_NAME;\n // Parse repository URL from package.json, stripping git+ prefix and .git suffix\n const rawRepoUrl = typeof pkg.repository === 'object' ? pkg.repository.url : pkg.repository;\n const repositoryUrl = rawRepoUrl?.replace(/^git\\+/, '').replace(/\\.git$/, '') ?? `https://github.com/mcp-z/${name}`;\n const baseDir = resolveBaseDir();\n const cliLogLevel = typeof values['log-level'] === 'string' ? values['log-level'] : undefined;\n const envLogLevel = env.LOG_LEVEL;\n const logLevel = cliLogLevel ?? envLogLevel ?? 'info';\n\n // Parse storage configuration\n const cliResourceStoreUri = typeof values['resource-store-uri'] === 'string' ? values['resource-store-uri'] : undefined;\n const envResourceStoreUri = env.RESOURCE_STORE_URI;\n const defaultResourceStorePath = path.join(baseDir, name, 'files');\n const resourceStoreUri = normalizeResourceStoreUri(cliResourceStoreUri ?? envResourceStoreUri ?? defaultResourceStorePath);\n\n const cliBaseUrl = typeof values['base-url'] === 'string' ? values['base-url'] : undefined;\n const envBaseUrl = env.BASE_URL;\n const baseUrl = cliBaseUrl ?? envBaseUrl;\n\n // Combine configs\n return {\n ...oauthConfig, // Includes clientId, auth, headless, redirectUri\n transport: transportConfig.transport,\n logLevel,\n baseDir,\n name,\n version: pkg.version,\n repositoryUrl,\n resourceStoreUri,\n ...(baseUrl && { baseUrl }),\n ...(dcrConfig && { dcrConfig }),\n };\n}\n\nfunction normalizeResourceStoreUri(resourceStoreUri: string): string {\n const filePrefix = 'file://';\n if (resourceStoreUri.startsWith(filePrefix)) {\n const rawPath = resourceStoreUri.slice(filePrefix.length);\n const filePath = rawPath.startsWith('~') ? rawPath.replace(/^~/, homedir()) : rawPath.startsWith('/') ? fileURLToPath(resourceStoreUri) : rawPath;\n return pathToFileURL(path.resolve(filePath)).href;\n }\n\n if (resourceStoreUri.includes('://')) return resourceStoreUri;\n\n const expandedPath = resourceStoreUri.startsWith('~') ? resourceStoreUri.replace(/^~/, homedir()) : resourceStoreUri;\n return pathToFileURL(path.resolve(expandedPath)).href;\n}\n\n/** The server's data directory: `.mcp-z` beside the nearest .mcp.json (searched from cwd up to home), else in the home directory. */\nfunction resolveBaseDir(): string {\n const mcpServer = _require('@mcp-z/server') as typeof McpServer;\n try {\n const configPath = mcpServer.findConfigPath({ config: '.mcp.json', cwd: process.cwd(), stopDir: homedir() });\n return path.join(path.dirname(configPath), '.mcp-z');\n } catch {\n return path.join(homedir(), '.mcp-z');\n }\n}\n\n/**\n * Build production configuration from process globals.\n * Entry point for production server.\n */\nexport function createConfig(): ServerConfig {\n const mcpServer = _require('@mcp-z/server') as typeof McpServer;\n const envResult = mcpServer.loadServerEnv({ name: SERVER_NAME, baseDir: resolveBaseDir() });\n try {\n return parseConfig(process.argv, process.env);\n } catch (error) {\n throw new Error(`${(error as Error).message}\\n${mcpServer.formatServerEnvSearch(envResult)}`);\n }\n}\n"],"names":["fileURLToPath","pathToFileURL","Module","homedir","path","parseArgs","GOOGLE_SCOPE","readPkg","pkg","SERVER_NAME","name","replace","_require","require","createRequire","url","parseConfig","args","env","cliLogLevel","cliResourceStoreUri","oauthGoogle","mcpServer","transportConfig","oauthConfig","dcrConfig","auth","parseDcrConfig","undefined","values","options","type","strict","allowPositionals","rawRepoUrl","repository","repositoryUrl","baseDir","resolveBaseDir","envLogLevel","LOG_LEVEL","logLevel","envResourceStoreUri","RESOURCE_STORE_URI","defaultResourceStorePath","join","resourceStoreUri","normalizeResourceStoreUri","cliBaseUrl","envBaseUrl","BASE_URL","baseUrl","transport","version","filePrefix","startsWith","rawPath","slice","length","filePath","resolve","href","includes","expandedPath","configPath","findConfigPath","config","cwd","process","stopDir","dirname","createConfig","envResult","loadServerEnv","argv","error","Error","message","formatServerEnvSearch"],"mappings":"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"}
@@ -42,6 +42,13 @@ Environment Variables:
42
42
  RESOURCE_STORE_URI Resource store URI (optional, file://)
43
43
  BASE_URL Base URL for HTTP file serving (optional)
44
44
 
45
+ Configuration Files:
46
+ Variables may also be set in the first of these files that exists:
47
+ 1. .mcp-z/mcp-sheets/.env beside the nearest .mcp.json (else ~/.mcp-z/mcp-sheets/.env)
48
+ 2. ~/.config/mcp-z/mcp-sheets/.env (~ is your home directory, on every OS)
49
+ Values already in the environment, including .mcp.json "env", take precedence.
50
+ On macOS and Linux the file must be private (chmod 600), or the server will not start.
51
+
45
52
  Storage Backends:
46
53
  TOKEN_STORE_URI and DCR_STORE_URI accept any keyv-registry protocol.
47
54
  file:// (the default) and memory:// work out of the box. Any other backend
@@ -1 +1 @@
1
- {"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-sheets/src/setup/version-help.ts"],"sourcesContent":["import * as fs from 'fs';\nimport moduleRoot from 'module-root-sync';\nimport * as path from 'path';\nimport * as url from 'url';\nimport { parseArgs } from 'util';\n\n// Kept dependency-free (fs/path/url/module-root-sync only) so `--version`/`--help`\n// resolve nothing beyond Node startup: config.ts's parseConfig pulls in @mcp-z/oauth-google and\n// @mcp-z/server, which this path must not touch.\nconst pkg = JSON.parse(fs.readFileSync(path.join(moduleRoot(url.fileURLToPath(import.meta.url)), 'package.json'), 'utf-8'));\n\nconst HELP_TEXT = `\nUsage: mcp-sheets [options]\n\nMCP server for Google Sheets spreadsheet management with OAuth authentication.\n\nOptions:\n --version, -v Show version number\n --help, -h Show this help message\n --auth=<mode> Authentication mode (default: loopback-oauth)\n Modes: loopback-oauth, service-account, dcr\n --headless Disable browser auto-open, return auth URL instead\n --redirect-uri=<uri> OAuth redirect URI (default: ephemeral loopback)\n --dcr-mode=<mode> DCR mode (self-hosted or external, default: self-hosted)\n --dcr-verify-url=<url> External verification endpoint (required for external mode)\n --dcr-store-uri=<uri> DCR client storage URI (required for self-hosted mode)\n --port=<port> Enable HTTP transport on specified port\n --stdio Enable stdio transport (default if no port)\n --log-level=<level> Logging level (default: info)\n --resource-store-uri=<uri> Resource store URI for CSV file storage (default: file://~/.mcp-z/mcp-sheets/files)\n --base-url=<url> Base URL for HTTP file serving (optional)\n\nEnvironment Variables:\n GOOGLE_CLIENT_ID OAuth client ID (REQUIRED)\n GOOGLE_CLIENT_SECRET OAuth client secret (optional)\n AUTH_MODE Default authentication mode (optional)\n HEADLESS Disable browser auto-open (optional)\n DCR_MODE DCR mode (optional, same format as --dcr-mode)\n DCR_VERIFY_URL External verification URL (optional, same as --dcr-verify-url)\n DCR_STORE_URI DCR storage URI (optional, same as --dcr-store-uri)\n TOKEN_STORE_URI Token storage URI (optional)\n PORT Default HTTP port (optional)\n LOG_LEVEL Default logging level (optional)\n RESOURCE_STORE_URI Resource store URI (optional, file://)\n BASE_URL Base URL for HTTP file serving (optional)\n\nStorage Backends:\n TOKEN_STORE_URI and DCR_STORE_URI accept any keyv-registry protocol.\n file:// (the default) and memory:// work out of the box. Any other backend\n needs its adapter installed alongside this server:\n npm install -g @keyv/redis\n TOKEN_STORE_URI=redis://localhost:6379 mcp-sheets\n\nOAuth Scopes:\n openid https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/spreadsheets https://www.googleapis.com/auth/drive\n\nExamples:\n mcp-sheets # Use default settings\n mcp-sheets --auth=service-account # Use service account auth\n mcp-sheets --port=3000 # HTTP transport on port 3000\n mcp-sheets --resource-store-uri=file:///tmp/sheets # Custom resource store URI\n GOOGLE_CLIENT_ID=xxx mcp-sheets # Set client ID via env var\n`.trim();\n\n/** Package metadata read from package.json, resolved relative to this file. */\nexport function readPkg(): { name: string; version: string; repository?: string | { url?: string } } {\n return pkg;\n}\n\n/**\n * Handle --version/--help flags before config parsing.\n * These must work without requiring any configuration or heavy dependency.\n */\nexport function handleVersionHelp(args: string[]): { handled: boolean; output?: string } {\n const { values } = parseArgs({\n args,\n options: {\n version: { type: 'boolean', short: 'v' },\n help: { type: 'boolean', short: 'h' },\n },\n strict: false,\n allowPositionals: true,\n });\n\n if (values.version) return { handled: true, output: pkg.version };\n if (values.help) return { handled: true, output: HELP_TEXT };\n return { handled: false };\n}\n"],"names":["fs","moduleRoot","path","url","parseArgs","pkg","JSON","parse","readFileSync","join","fileURLToPath","HELP_TEXT","trim","readPkg","handleVersionHelp","args","values","options","version","type","short","help","strict","allowPositionals","handled","output"],"mappings":"AAAA,YAAYA,QAAQ,KAAK;AACzB,OAAOC,gBAAgB,mBAAmB;AAC1C,YAAYC,UAAU,OAAO;AAC7B,YAAYC,SAAS,MAAM;AAC3B,SAASC,SAAS,QAAQ,OAAO;AAEjC,mFAAmF;AACnF,gGAAgG;AAChG,iDAAiD;AACjD,MAAMC,MAAMC,KAAKC,KAAK,CAACP,GAAGQ,YAAY,CAACN,KAAKO,IAAI,CAACR,WAAWE,IAAIO,aAAa,CAAC,YAAYP,GAAG,IAAI,iBAAiB;AAElH,MAAMQ,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAmDnB,CAAC,CAACC,IAAI;AAEN,6EAA6E,GAC7E,OAAO,SAASC;IACd,OAAOR;AACT;AAEA;;;CAGC,GACD,OAAO,SAASS,kBAAkBC,IAAc;IAC9C,MAAM,EAAEC,MAAM,EAAE,GAAGZ,UAAU;QAC3BW;QACAE,SAAS;YACPC,SAAS;gBAAEC,MAAM;gBAAWC,OAAO;YAAI;YACvCC,MAAM;gBAAEF,MAAM;gBAAWC,OAAO;YAAI;QACtC;QACAE,QAAQ;QACRC,kBAAkB;IACpB;IAEA,IAAIP,OAAOE,OAAO,EAAE,OAAO;QAAEM,SAAS;QAAMC,QAAQpB,IAAIa,OAAO;IAAC;IAChE,IAAIF,OAAOK,IAAI,EAAE,OAAO;QAAEG,SAAS;QAAMC,QAAQd;IAAU;IAC3D,OAAO;QAAEa,SAAS;IAAM;AAC1B"}
1
+ {"version":3,"sources":["/Users/kevin/Dev/open-source/ai/mcp-z/mcp-sheets/src/setup/version-help.ts"],"sourcesContent":["import * as fs from 'fs';\nimport moduleRoot from 'module-root-sync';\nimport * as path from 'path';\nimport * as url from 'url';\nimport { parseArgs } from 'util';\n\n// Kept dependency-free (fs/path/url/module-root-sync only) so `--version`/`--help`\n// resolve nothing beyond Node startup: config.ts's parseConfig pulls in @mcp-z/oauth-google and\n// @mcp-z/server, which this path must not touch.\nconst pkg = JSON.parse(fs.readFileSync(path.join(moduleRoot(url.fileURLToPath(import.meta.url)), 'package.json'), 'utf-8'));\n\nconst HELP_TEXT = `\nUsage: mcp-sheets [options]\n\nMCP server for Google Sheets spreadsheet management with OAuth authentication.\n\nOptions:\n --version, -v Show version number\n --help, -h Show this help message\n --auth=<mode> Authentication mode (default: loopback-oauth)\n Modes: loopback-oauth, service-account, dcr\n --headless Disable browser auto-open, return auth URL instead\n --redirect-uri=<uri> OAuth redirect URI (default: ephemeral loopback)\n --dcr-mode=<mode> DCR mode (self-hosted or external, default: self-hosted)\n --dcr-verify-url=<url> External verification endpoint (required for external mode)\n --dcr-store-uri=<uri> DCR client storage URI (required for self-hosted mode)\n --port=<port> Enable HTTP transport on specified port\n --stdio Enable stdio transport (default if no port)\n --log-level=<level> Logging level (default: info)\n --resource-store-uri=<uri> Resource store URI for CSV file storage (default: file://~/.mcp-z/mcp-sheets/files)\n --base-url=<url> Base URL for HTTP file serving (optional)\n\nEnvironment Variables:\n GOOGLE_CLIENT_ID OAuth client ID (REQUIRED)\n GOOGLE_CLIENT_SECRET OAuth client secret (optional)\n AUTH_MODE Default authentication mode (optional)\n HEADLESS Disable browser auto-open (optional)\n DCR_MODE DCR mode (optional, same format as --dcr-mode)\n DCR_VERIFY_URL External verification URL (optional, same as --dcr-verify-url)\n DCR_STORE_URI DCR storage URI (optional, same as --dcr-store-uri)\n TOKEN_STORE_URI Token storage URI (optional)\n PORT Default HTTP port (optional)\n LOG_LEVEL Default logging level (optional)\n RESOURCE_STORE_URI Resource store URI (optional, file://)\n BASE_URL Base URL for HTTP file serving (optional)\n\nConfiguration Files:\n Variables may also be set in the first of these files that exists:\n 1. .mcp-z/mcp-sheets/.env beside the nearest .mcp.json (else ~/.mcp-z/mcp-sheets/.env)\n 2. ~/.config/mcp-z/mcp-sheets/.env (~ is your home directory, on every OS)\n Values already in the environment, including .mcp.json \"env\", take precedence.\n On macOS and Linux the file must be private (chmod 600), or the server will not start.\n\nStorage Backends:\n TOKEN_STORE_URI and DCR_STORE_URI accept any keyv-registry protocol.\n file:// (the default) and memory:// work out of the box. Any other backend\n needs its adapter installed alongside this server:\n npm install -g @keyv/redis\n TOKEN_STORE_URI=redis://localhost:6379 mcp-sheets\n\nOAuth Scopes:\n openid https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/spreadsheets https://www.googleapis.com/auth/drive\n\nExamples:\n mcp-sheets # Use default settings\n mcp-sheets --auth=service-account # Use service account auth\n mcp-sheets --port=3000 # HTTP transport on port 3000\n mcp-sheets --resource-store-uri=file:///tmp/sheets # Custom resource store URI\n GOOGLE_CLIENT_ID=xxx mcp-sheets # Set client ID via env var\n`.trim();\n\n/** Package metadata read from package.json, resolved relative to this file. */\nexport function readPkg(): { name: string; version: string; repository?: string | { url?: string } } {\n return pkg;\n}\n\n/**\n * Handle --version/--help flags before config parsing.\n * These must work without requiring any configuration or heavy dependency.\n */\nexport function handleVersionHelp(args: string[]): { handled: boolean; output?: string } {\n const { values } = parseArgs({\n args,\n options: {\n version: { type: 'boolean', short: 'v' },\n help: { type: 'boolean', short: 'h' },\n },\n strict: false,\n allowPositionals: true,\n });\n\n if (values.version) return { handled: true, output: pkg.version };\n if (values.help) return { handled: true, output: HELP_TEXT };\n return { handled: false };\n}\n"],"names":["fs","moduleRoot","path","url","parseArgs","pkg","JSON","parse","readFileSync","join","fileURLToPath","HELP_TEXT","trim","readPkg","handleVersionHelp","args","values","options","version","type","short","help","strict","allowPositionals","handled","output"],"mappings":"AAAA,YAAYA,QAAQ,KAAK;AACzB,OAAOC,gBAAgB,mBAAmB;AAC1C,YAAYC,UAAU,OAAO;AAC7B,YAAYC,SAAS,MAAM;AAC3B,SAASC,SAAS,QAAQ,OAAO;AAEjC,mFAAmF;AACnF,gGAAgG;AAChG,iDAAiD;AACjD,MAAMC,MAAMC,KAAKC,KAAK,CAACP,GAAGQ,YAAY,CAACN,KAAKO,IAAI,CAACR,WAAWE,IAAIO,aAAa,CAAC,YAAYP,GAAG,IAAI,iBAAiB;AAElH,MAAMQ,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA0DnB,CAAC,CAACC,IAAI;AAEN,6EAA6E,GAC7E,OAAO,SAASC;IACd,OAAOR;AACT;AAEA;;;CAGC,GACD,OAAO,SAASS,kBAAkBC,IAAc;IAC9C,MAAM,EAAEC,MAAM,EAAE,GAAGZ,UAAU;QAC3BW;QACAE,SAAS;YACPC,SAAS;gBAAEC,MAAM;gBAAWC,OAAO;YAAI;YACvCC,MAAM;gBAAEF,MAAM;gBAAWC,OAAO;YAAI;QACtC;QACAE,QAAQ;QACRC,kBAAkB;IACpB;IAEA,IAAIP,OAAOE,OAAO,EAAE,OAAO;QAAEM,SAAS;QAAMC,QAAQpB,IAAIa,OAAO;IAAC;IAChE,IAAIF,OAAOK,IAAI,EAAE,OAAO;QAAEG,SAAS;QAAMC,QAAQd;IAAU;IAC3D,OAAO;QAAEa,SAAS;IAAM;AAC1B"}
@@ -1,17 +1,13 @@
1
1
  import { a1Col } from './column-utilities.js';
2
- import { findSheetByRef } from './sheet-operations.js';
2
+ import { findSheetByRef, scanKeyColumnRows } from './sheet-operations.js';
3
3
  export async function discoverHeader(sheets, spreadsheetId, sheetTitle) {
4
- try {
5
- var _response_data;
6
- const response = await sheets.spreadsheets.values.get({
7
- spreadsheetId,
8
- range: `${sheetTitle}!1:1`,
9
- majorDimension: 'ROWS'
10
- });
11
- return (((_response_data = response.data) === null || _response_data === void 0 ? void 0 : _response_data.values) || [])[0] || [];
12
- } catch {
13
- return [];
14
- }
4
+ var _response_data;
5
+ const response = await sheets.spreadsheets.values.get({
6
+ spreadsheetId,
7
+ range: `${sheetTitle}!1:1`,
8
+ majorDimension: 'ROWS'
9
+ });
10
+ return (((_response_data = response.data) === null || _response_data === void 0 ? void 0 : _response_data.values) || [])[0] || [];
15
11
  }
16
12
  export function validateAndMapHeaders(sheetHeaders, canonicalHeaders, requiredColumns = []) {
17
13
  const normalizeColumn = (col)=>String(col !== null && col !== void 0 ? col : '').toLowerCase().replace(/[^a-z0-9]/g, '');
@@ -307,6 +303,22 @@ export function mapRowsToHeader({ rows = [], header = [], canonical = [] }) {
307
303
  return mappedRow;
308
304
  });
309
305
  }
306
+ /** Calls onKey with each non-empty generated key of the data rows and its 1-indexed row number; see scanKeyColumnRows for the bounded, error-reporting scan. */ async function scanKeyRows(sheets, spreadsheetId, sheetTitle, header, keyIndices, strategy, onKey) {
307
+ const minIndex = Math.min(...keyIndices);
308
+ const maxIndex = Math.max(...keyIndices);
309
+ await scanKeyColumnRows(sheets, spreadsheetId, sheetTitle, a1Col(minIndex + 1), a1Col(maxIndex + 1), (rawRow, rowNumber)=>{
310
+ // Reconstruct full row for key generation
311
+ const fullRow = new Array(header.length).fill('');
312
+ keyIndices.forEach((globalIndex)=>{
313
+ const localRowArrayIndex = globalIndex - minIndex;
314
+ if (localRowArrayIndex >= 0 && localRowArrayIndex < rawRow.length) {
315
+ fullRow[globalIndex] = rawRow[localRowArrayIndex];
316
+ }
317
+ });
318
+ const key = generateRowKey(fullRow, header, strategy);
319
+ if (key.replace(/\\+/g, '') !== '') onKey(key, rowNumber);
320
+ });
321
+ }
310
322
  export async function snapshotHeaderAndKeys(sheets, spreadsheetId, sheetTitle, keyColumns = [
311
323
  'id'
312
324
  ], keyStrategy) {
@@ -342,51 +354,23 @@ export async function snapshotHeaderAndKeys(sheets, spreadsheetId, sheetTitle, k
342
354
  keyIndices
343
355
  };
344
356
  }
345
- // Read key columns data in chunks
346
- const chunkSize = 1000;
347
- let startRow = 2;
348
- const minIndex = Math.min(...keyIndices);
349
- const maxIndex = Math.max(...keyIndices);
350
- const startCol = a1Col(minIndex + 1);
351
- const endCol = a1Col(maxIndex + 1);
352
- while(true){
353
- const endRow = startRow + chunkSize - 1;
354
- const range = `${sheetTitle}!${startCol}${startRow}:${endCol}${endRow}`;
355
- try {
356
- var _response_data;
357
- const response = await sheets.spreadsheets.values.get({
358
- spreadsheetId,
359
- range,
360
- majorDimension: 'ROWS'
361
- });
362
- const rows = ((_response_data = response.data) === null || _response_data === void 0 ? void 0 : _response_data.values) || [];
363
- if (rows.length === 0) break;
364
- for (const rawRow of rows){
365
- // Reconstruct full row for key generation
366
- const fullRow = new Array(header.length).fill('');
367
- keyIndices.forEach((globalIndex, _localIndex)=>{
368
- const localRowIndex = globalIndex - minIndex;
369
- if (localRowIndex >= 0 && localRowIndex < rawRow.length) {
370
- fullRow[globalIndex] = rawRow[localRowIndex];
371
- }
372
- });
373
- const key = generateRowKey(fullRow, header, strategy);
374
- if (key.replace(/\\+/g, '') !== '') {
375
- keySet.add(key);
376
- }
377
- }
378
- startRow += rows.length;
379
- if (rows.length < chunkSize) break; // Last chunk
380
- } catch {
381
- break; // End of data or error
382
- }
383
- }
357
+ await scanKeyRows(sheets, spreadsheetId, sheetTitle, header, keyIndices, strategy, (key)=>{
358
+ keySet.add(key);
359
+ });
384
360
  return {
385
361
  header,
386
362
  keySet,
387
363
  keyIndices
388
364
  };
389
365
  }
366
+ /** Message naming every duplicate key and its 1-indexed row numbers */ function formatDuplicateSheetKeys(keyToRows) {
367
+ const parts = [];
368
+ keyToRows.forEach((rows, key)=>{
369
+ if (rows.length > 1) parts.push(`"${key}" (rows ${rows.join(', ')})`);
370
+ });
371
+ if (parts.length === 0) return undefined;
372
+ return `duplicate keys found on the sheet: ${parts.join('; ')}. Nothing was written; make each key unique and retry.`;
373
+ }
390
374
  /** Tracks row positions for updates in addition to keys */ export async function snapshotHeaderKeysAndPositions(sheets, spreadsheetId, sheetTitle, keyColumns = [
391
375
  'id'
392
376
  ], keyStrategy) {
@@ -394,6 +378,7 @@ export async function snapshotHeaderAndKeys(sheets, spreadsheetId, sheetTitle, k
394
378
  const header = await discoverHeader(sheets, spreadsheetId, sheetTitle);
395
379
  const keySet = new Set();
396
380
  const keyToRowMap = new Map();
381
+ const keyToRows = new Map();
397
382
  if (header.length === 0) {
398
383
  return {
399
384
  header,
@@ -425,50 +410,17 @@ export async function snapshotHeaderAndKeys(sheets, spreadsheetId, sheetTitle, k
425
410
  keyIndices
426
411
  };
427
412
  }
428
- // Read key columns data in chunks and track row positions
429
- const chunkSize = 1000;
430
- let startRow = 2; // Start from row 2 (after header)
431
- const minIndex = Math.min(...keyIndices);
432
- const maxIndex = Math.max(...keyIndices);
433
- const startCol = a1Col(minIndex + 1);
434
- const endCol = a1Col(maxIndex + 1);
435
- while(true){
436
- const endRow = startRow + chunkSize - 1;
437
- const range = `${sheetTitle}!${startCol}${startRow}:${endCol}${endRow}`;
438
- try {
439
- var _response_data;
440
- const response = await sheets.spreadsheets.values.get({
441
- spreadsheetId,
442
- range,
443
- majorDimension: 'ROWS'
444
- });
445
- const rows = ((_response_data = response.data) === null || _response_data === void 0 ? void 0 : _response_data.values) || [];
446
- if (rows.length === 0) break;
447
- for(let localRowIndex = 0; localRowIndex < rows.length; localRowIndex++){
448
- const rawRow = rows[localRowIndex];
449
- const globalRowNumber = startRow + localRowIndex;
450
- // Reconstruct full row for key generation
451
- const fullRow = new Array(header.length).fill('');
452
- if (rawRow) {
453
- keyIndices.forEach((globalIndex, _localIndex)=>{
454
- const localRowArrayIndex = globalIndex - minIndex;
455
- if (localRowArrayIndex >= 0 && localRowArrayIndex < rawRow.length) {
456
- fullRow[globalIndex] = rawRow[localRowArrayIndex];
457
- }
458
- });
459
- }
460
- const key = generateRowKey(fullRow, header, strategy);
461
- if (key.replace(/\\+/g, '') !== '') {
462
- keySet.add(key);
463
- keyToRowMap.set(key, globalRowNumber); // Store 1-indexed row number
464
- }
465
- }
466
- startRow += rows.length;
467
- if (rows.length < chunkSize) break; // Last chunk
468
- } catch {
469
- break; // End of data or error
470
- }
471
- }
413
+ await scanKeyRows(sheets, spreadsheetId, sheetTitle, header, keyIndices, strategy, (key, rowNumber)=>{
414
+ keySet.add(key);
415
+ keyToRowMap.set(key, rowNumber); // Store 1-indexed row number
416
+ const seenRows = keyToRows.get(key);
417
+ if (seenRows) seenRows.push(rowNumber);
418
+ else keyToRows.set(key, [
419
+ rowNumber
420
+ ]);
421
+ });
422
+ const duplicateMessage = formatDuplicateSheetKeys(keyToRows);
423
+ if (duplicateMessage) throw new Error(duplicateMessage);
472
424
  return {
473
425
  header,
474
426
  keySet,