@memnexus-ai/mx-agent-cli 0.1.296-next.5 → 0.1.296-next.6

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 (51) hide show
  1. package/dist/__tests__/catalog-origin-main.test.js +12 -3
  2. package/dist/__tests__/catalog-origin-main.test.js.map +1 -1
  3. package/dist/__tests__/new-project-first-team.test.js +149 -1
  4. package/dist/__tests__/new-project-first-team.test.js.map +1 -1
  5. package/dist/__tests__/provision-behavioral-contract.test.js +3 -1
  6. package/dist/__tests__/provision-behavioral-contract.test.js.map +1 -1
  7. package/dist/__tests__/provision-catalog-precondition.test.js +3 -1
  8. package/dist/__tests__/provision-catalog-precondition.test.js.map +1 -1
  9. package/dist/__tests__/provision-completion-rows.test.js +10 -1
  10. package/dist/__tests__/provision-completion-rows.test.js.map +1 -1
  11. package/dist/__tests__/provision-identity-gate.test.js +3 -1
  12. package/dist/__tests__/provision-identity-gate.test.js.map +1 -1
  13. package/dist/__tests__/provision-resume.test.js +35 -1
  14. package/dist/__tests__/provision-resume.test.js.map +1 -1
  15. package/dist/__tests__/provision-row12-stub-server.test.js +3 -1
  16. package/dist/__tests__/provision-row12-stub-server.test.js.map +1 -1
  17. package/dist/__tests__/provision-skeleton-fill.test.js +3 -1
  18. package/dist/__tests__/provision-skeleton-fill.test.js.map +1 -1
  19. package/dist/__tests__/provision-step8-commit.test.d.ts +40 -0
  20. package/dist/__tests__/provision-step8-commit.test.d.ts.map +1 -0
  21. package/dist/__tests__/provision-step8-commit.test.js +529 -0
  22. package/dist/__tests__/provision-step8-commit.test.js.map +1 -0
  23. package/dist/__tests__/provision-teambuilder-flow.test.js +3 -1
  24. package/dist/__tests__/provision-teambuilder-flow.test.js.map +1 -1
  25. package/dist/__tests__/rows-9-10-zero-remotes.test.d.ts +32 -0
  26. package/dist/__tests__/rows-9-10-zero-remotes.test.d.ts.map +1 -0
  27. package/dist/__tests__/rows-9-10-zero-remotes.test.js +203 -0
  28. package/dist/__tests__/rows-9-10-zero-remotes.test.js.map +1 -0
  29. package/dist/__tests__/template-sync.test.js +5 -1
  30. package/dist/__tests__/template-sync.test.js.map +1 -1
  31. package/dist/commands/create.d.ts +116 -0
  32. package/dist/commands/create.d.ts.map +1 -1
  33. package/dist/commands/create.js +304 -79
  34. package/dist/commands/create.js.map +1 -1
  35. package/dist/commands/new.d.ts +27 -0
  36. package/dist/commands/new.d.ts.map +1 -1
  37. package/dist/commands/new.js +92 -4
  38. package/dist/commands/new.js.map +1 -1
  39. package/dist/lib/catalog-commit.d.ts +99 -0
  40. package/dist/lib/catalog-commit.d.ts.map +1 -0
  41. package/dist/lib/catalog-commit.js +315 -0
  42. package/dist/lib/catalog-commit.js.map +1 -0
  43. package/dist/lib/catalog.d.ts +16 -8
  44. package/dist/lib/catalog.d.ts.map +1 -1
  45. package/dist/lib/catalog.js +17 -9
  46. package/dist/lib/catalog.js.map +1 -1
  47. package/dist/lib/roster.d.ts +19 -0
  48. package/dist/lib/roster.d.ts.map +1 -1
  49. package/dist/lib/roster.js +18 -8
  50. package/dist/lib/roster.js.map +1 -1
  51. package/package.json +1 -1
@@ -38,5 +38,32 @@ export interface NewOptions {
38
38
  /** Rollback override for the behavioral-block contract (#4541); forwarded to runCreate. */
39
39
  allowMissingBehavioralMarkers?: boolean;
40
40
  }
41
+ /**
42
+ * The named step for the three credential failures an operator meets first on
43
+ * a new project (#607, #610), or null for every other failure.
44
+ *
45
+ * A new project's first team asks the coordination service for its token with
46
+ * the operator's MemNexus user key, and the service creates the project on that
47
+ * request. Two outcomes there need something other than a bare re-run:
48
+ *
49
+ * - NO USER KEY on this machine. Nothing was sent. The fix is a login, then
50
+ * the same provision command.
51
+ * - A 429: the service's self-service creation cap is reached. A re-run is
52
+ * refused again for the same reason until the cap clears, so the step says
53
+ * that and names who can create the project instead.
54
+ * - A 403. The service answers 403 both when this login holds no grant and
55
+ * when another login already owns the project name (`planLoginCreation`,
56
+ * coordination-service `credential-routes.ts`). For the second, a re-run is
57
+ * refused identically, so the step names a different project name first and
58
+ * the grant remedy second. It says only that the name MAY be owned: the
59
+ * 403 does not tell the two causes apart, and the CLI must not either.
60
+ *
61
+ * Matched on fixed detail constants, never on service output: row 10 holds
62
+ * `SELF_SERVICE_REFUSED_DETAIL` (create.ts) for a 403 in a project the service
63
+ * creates on login, and `CREDENTIAL_NOT_AUTHORIZED_DETAIL`
64
+ * (lib/coordination-token.ts) otherwise. Those constants interpolate nothing,
65
+ * so a response body cannot select or forge any branch.
66
+ */
67
+ export declare function credentialFailureStep(failure: string): string[] | null;
41
68
  export declare function runNew(projectName: string, options: NewOptions): Promise<void>;
42
69
  //# sourceMappingURL=new.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"new.d.ts","sourceRoot":"","sources":["../../src/commands/new.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAiBH,OAAO,EAAqB,KAAK,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAY/E,MAAM,WAAW,UAAU;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iFAAiF;IACjF,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,2FAA2F;IAC3F,6BAA6B,CAAC,EAAE,OAAO,CAAC;CACzC;AAyBD,wBAAsB,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAyVpF"}
1
+ {"version":3,"file":"new.d.ts","sourceRoot":"","sources":["../../src/commands/new.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAiBH,OAAO,EAAqB,KAAK,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAkB/E,MAAM,WAAW,UAAU;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iFAAiF;IACjF,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,2FAA2F;IAC3F,6BAA6B,CAAC,EAAE,OAAO,CAAC;CACzC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAmCtE;AAyBD,wBAAsB,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAmXpF"}
@@ -32,12 +32,76 @@ import { fileURLToPath } from 'url';
32
32
  const __dirname = dirname(fileURLToPath(import.meta.url));
33
33
  import chalk from 'chalk';
34
34
  import { runInit } from './init.js';
35
- import { runCreate, isCatalogPreconditionRefusal } from './create.js';
35
+ import { runCreate, isCatalogPreconditionRefusal, SELF_SERVICE_REFUSED_DETAIL } from './create.js';
36
36
  import { shellSingleQuote } from '../lib/memory.js';
37
37
  import { PROJECT_CONFIG_DEFAULTS, validateCoordinationServiceUrl, validateProjectConfig, } from '../lib/project-config.js';
38
38
  import { maybeCreateRemote } from '../lib/gh-remote.js';
39
+ import { CREDENTIAL_LIMIT_REACHED_DETAIL, CREDENTIAL_NO_USER_KEY_DETAIL, CREDENTIAL_NOT_AUTHORIZED_DETAIL, } from '../lib/coordination-token.js';
40
+ import { findTeamWorktree } from '../lib/worktree.js';
39
41
  import { TEAM_BUILDER_ROLEGUIDE, newProjectDockerfileTemplate, newProjectDevcontainerJsonTemplate, newProjectPostCreateShTemplate, newProjectPostStartShTemplate, newProjectGitignoreTemplate, newProjectMxAgentCliVersionPinTemplate, } from '../lib/templates.js';
40
42
  import { runningCliVersion } from '../lib/framework-version.js';
43
+ /**
44
+ * The named step for the three credential failures an operator meets first on
45
+ * a new project (#607, #610), or null for every other failure.
46
+ *
47
+ * A new project's first team asks the coordination service for its token with
48
+ * the operator's MemNexus user key, and the service creates the project on that
49
+ * request. Two outcomes there need something other than a bare re-run:
50
+ *
51
+ * - NO USER KEY on this machine. Nothing was sent. The fix is a login, then
52
+ * the same provision command.
53
+ * - A 429: the service's self-service creation cap is reached. A re-run is
54
+ * refused again for the same reason until the cap clears, so the step says
55
+ * that and names who can create the project instead.
56
+ * - A 403. The service answers 403 both when this login holds no grant and
57
+ * when another login already owns the project name (`planLoginCreation`,
58
+ * coordination-service `credential-routes.ts`). For the second, a re-run is
59
+ * refused identically, so the step names a different project name first and
60
+ * the grant remedy second. It says only that the name MAY be owned: the
61
+ * 403 does not tell the two causes apart, and the CLI must not either.
62
+ *
63
+ * Matched on fixed detail constants, never on service output: row 10 holds
64
+ * `SELF_SERVICE_REFUSED_DETAIL` (create.ts) for a 403 in a project the service
65
+ * creates on login, and `CREDENTIAL_NOT_AUTHORIZED_DETAIL`
66
+ * (lib/coordination-token.ts) otherwise. Those constants interpolate nothing,
67
+ * so a response body cannot select or forge any branch.
68
+ */
69
+ export function credentialFailureStep(failure) {
70
+ if (failure.includes(CREDENTIAL_NO_USER_KEY_DETAIL)) {
71
+ return [
72
+ chalk.bold(' Named step: log in to MemNexus, then provision again.'),
73
+ ' No MemNexus user key is on this machine, so no credential was requested. The',
74
+ ' coordination service issues the team\'s token only to a request that presents',
75
+ ' your user key, and that request is also what registers this project there.',
76
+ ` ${chalk.cyan('mx auth login')}${chalk.dim(' (or set MX_API_KEY)')}`,
77
+ ];
78
+ }
79
+ if (failure.includes(CREDENTIAL_LIMIT_REACHED_DETAIL)) {
80
+ return [
81
+ chalk.bold(' Named step: the coordination service\'s self-service cap is reached.'),
82
+ ' It refused to create this project on login (HTTP 429). The caps are 10 projects per',
83
+ ' owner, 50 teams per project, and 20 new projects across the service in 24 hours.',
84
+ ' Running provision again is refused for the same reason until the cap clears. Next',
85
+ ' step: ask an operator of the coordination service to create the project with',
86
+ ' POST /admin/provision, which the caps do not apply to, or wait for the 24-hour',
87
+ ' window, then run the command below.',
88
+ ];
89
+ }
90
+ if (failure.includes(SELF_SERVICE_REFUSED_DETAIL) || failure.includes(CREDENTIAL_NOT_AUTHORIZED_DETAIL)) {
91
+ return [
92
+ chalk.bold(' Named step: the coordination service refused this login for the project (HTTP 403).'),
93
+ ' The service gives this answer for two causes and does not say which one applies.',
94
+ ' 1. Another MemNexus login may already own this project name. If so, running provision',
95
+ ' again is refused the same way. Choose another name and create the project again:',
96
+ ` ${chalk.cyan('mx-agent new project <other-name>')}`,
97
+ ' 2. This login may hold no grant for the team. Run from the MemNexus login that owns the',
98
+ ' project (mx auth login), or ask an operator of the coordination service to add the',
99
+ ' team with POST /admin/provision and grant you with POST /admin/grant. Then run the',
100
+ ' command below.',
101
+ ];
102
+ }
103
+ return null;
104
+ }
41
105
  /** Validate project name: letters, digits, hyphens/underscores, 1-50 chars, must start with letter or digit */
42
106
  function validateProjectName(name) {
43
107
  if (!/^[a-zA-Z0-9][a-zA-Z0-9_-]{0,49}$/.test(name)) {
@@ -260,9 +324,17 @@ export async function runNew(projectName, options) {
260
324
  // base branch there, so an uncommitted entry would refuse the SECOND team.
261
325
  // Only that one path is staged: the worktree step 7b created lives under
262
326
  // `.worktrees/` and is not this commit's business.
327
+ //
328
+ // SKIPPED WHEN THE ENTRY IS ALREADY TRACKED (#607). On a project with zero
329
+ // remotes, provisioning's own step 8 now commits the entry and fast-forwards
330
+ // the team worktree to that commit, so there is nothing left here to commit.
331
+ // This step still runs when step 8 fell back to an uncommitted entry.
263
332
  if (!provisionFailure) {
264
333
  const catalogEntryRel = join(PROJECT_CONFIG_DEFAULTS.teamsDir, 'team-builder.md');
265
- if (existsSync(join(outputDir, catalogEntryRel))) {
334
+ const tracked = spawnSync('git', ['ls-files', '--error-unmatch', '--', catalogEntryRel], {
335
+ cwd: outputDir, stdio: 'pipe',
336
+ }).status === 0;
337
+ if (!tracked && existsSync(join(outputDir, catalogEntryRel))) {
266
338
  const staged = spawnSync('git', ['add', '--', catalogEntryRel], { cwd: outputDir, stdio: 'pipe' });
267
339
  if (staged.status === 0) {
268
340
  spawnSync('git', ['commit', '-m', 'chore: add the team-builder catalog entry'], { cwd: outputDir, stdio: 'pipe' });
@@ -321,9 +393,25 @@ export async function runNew(projectName, options) {
321
393
  for (const line of provisionFailure.split('\n'))
322
394
  console.error(line);
323
395
  console.error();
324
- console.error(chalk.bold(' What exists:') + ` the project at ${outputDir}, its git history, and its agent`);
325
- console.error(' configuration. What does not: the team-builder worktree, or the rows named above.');
396
+ // Read from disk, not assumed: provisioning creates the worktree before the
397
+ // checks that can fail, so a failed run usually leaves one (#610 red-team).
398
+ const teamBuilderWorktree = findTeamWorktree(outputDir, 'team-builder', options.worktreeDir ?? PROJECT_CONFIG_DEFAULTS.worktreeDir);
399
+ if (teamBuilderWorktree) {
400
+ console.error(chalk.bold(' What exists:') + ` the project at ${outputDir}, its git history, its agent`);
401
+ console.error(` configuration, and the team-builder worktree at ${teamBuilderWorktree}.`);
402
+ console.error(' What does not: the rows named above.');
403
+ }
404
+ else {
405
+ console.error(chalk.bold(' What exists:') + ` the project at ${outputDir}, its git history, and its agent`);
406
+ console.error(' configuration. What does not: the team-builder worktree, or the rows named above.');
407
+ }
326
408
  console.error();
409
+ const credentialStep = credentialFailureStep(provisionFailure);
410
+ if (credentialStep) {
411
+ for (const line of credentialStep)
412
+ console.error(line);
413
+ console.error();
414
+ }
327
415
  if (isCatalogPreconditionRefusal(provisionFailure)) {
328
416
  // A re-run on its own repeats the same refusal: the precondition is about
329
417
  // the repository's state, not about this command (#51). The message above
@@ -1 +1 @@
1
- {"version":3,"file":"new.js","sourceRoot":"","sources":["../../src/commands/new.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"new.js","sourceRoot":"","sources":["../../src/commands/new.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,IAAI,CAAC;AAClF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC1D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,4BAA4B,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAC;AACnG,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EACL,uBAAuB,EACvB,8BAA8B,EAC9B,qBAAqB,GACtB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAyB,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EACL,+BAA+B,EAC/B,6BAA6B,EAC7B,gCAAgC,GACjC,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EACL,sBAAsB,EACtB,4BAA4B,EAC5B,kCAAkC,EAClC,8BAA8B,EAC9B,6BAA6B,EAC7B,2BAA2B,EAC3B,sCAAsC,GACvC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAehE;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,UAAU,qBAAqB,CAAC,OAAe;IACnD,IAAI,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAAC,EAAE,CAAC;QACpD,OAAO;YACL,KAAK,CAAC,IAAI,CAAC,yDAAyD,CAAC;YACrE,gFAAgF;YAChF,iFAAiF;YACjF,8EAA8E;YAC9E,SAAS,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,wBAAwB,CAAC,EAAE;SAC7E,CAAC;IACJ,CAAC;IACD,IAAI,OAAO,CAAC,QAAQ,CAAC,+BAA+B,CAAC,EAAE,CAAC;QACtD,OAAO;YACL,KAAK,CAAC,IAAI,CAAC,wEAAwE,CAAC;YACpF,uFAAuF;YACvF,oFAAoF;YACpF,qFAAqF;YACrF,gFAAgF;YAChF,kFAAkF;YAClF,uCAAuC;SACxC,CAAC;IACJ,CAAC;IACD,IAAI,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,gCAAgC,CAAC,EAAE,CAAC;QACxG,OAAO;YACL,KAAK,CAAC,IAAI,CAAC,uFAAuF,CAAC;YACnG,oFAAoF;YACpF,yFAAyF;YACzF,uFAAuF;YACvF,SAAS,KAAK,CAAC,IAAI,CAAC,mCAAmC,CAAC,EAAE;YAC1D,2FAA2F;YAC3F,yFAAyF;YACzF,yFAAyF;YACzF,qBAAqB;SACtB,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,+GAA+G;AAC/G,SAAS,mBAAmB,CAAC,IAAY;IACvC,IAAI,CAAC,kCAAkC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CACb,yBAAyB,IAAI,kGAAkG,CAChI,CAAC;IACJ,CAAC;IACD,IAAI,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACjG,MAAM,IAAI,KAAK,CAAC,iBAAiB,IAAI,mCAAmC,CAAC,CAAC;IAC5E,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,IAAY;IAC9B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;AAC9D,CAAC;AAED,SAAS,SAAS,CAAC,QAAgB,EAAE,OAAe;IAClD,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACjC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACpC,aAAa,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1C,UAAU,CAAC,QAAQ,CAAC,CAAC;AACvB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,WAAmB,EAAE,OAAmB;IACnE,mBAAmB,CAAC,WAAW,CAAC,CAAC;IACjC,4EAA4E;IAC5E,iFAAiF;IACjF,+EAA+E;IAC/E,4EAA4E;IAC5E,+EAA+E;IAC/E,6CAA6C;IAC7C,MAAM,sBAAsB,GAAG,OAAO,CAAC,sBAAsB;QAC3D,CAAC,CAAC,8BAA8B,CAAC,OAAO,CAAC,sBAAsB,CAAC;QAChE,CAAC,CAAC,SAAS,CAAC;IACd,qBAAqB,CAAC;QACpB,UAAU,EAAE,OAAO,CAAC,UAAU,IAAI,uBAAuB,CAAC,UAAU;QACpE,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,uBAAuB,CAAC,WAAW;QACvE,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,uBAAuB,CAAC,YAAY;QAC1E,WAAW,EAAE,WAAW;QACxB,GAAG,CAAC,sBAAsB,CAAC,CAAC,CAAC,EAAE,sBAAsB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC9D,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,WAAW,CAAC,CAAC;IAE3F,IAAI,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC1B,IAAI,OAAO,GAAa,EAAE,CAAC;QAC3B,IAAI,CAAC;YACH,OAAO,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;QACnC,CAAC;QAAC,MAAM,CAAC;YACP,YAAY;QACd,CAAC;QACD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,qDAAqD,SAAS,EAAE,CAAC,CAAC,CAAC;YAC3F,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,gEAAgE,CAAC,CAAC,CAAC;YAC3F,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IAED,OAAO,CAAC,GAAG,EAAE,CAAC;IACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC,CAAC;IAC9D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACvC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,WAAW,EAAE,CAAC,CAAC;IAC/D,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,SAAS,EAAE,CAAC,CAAC;IAC7D,OAAO,CAAC,GAAG,EAAE,CAAC;IAEd,sBAAsB;IACtB,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAE1C,4CAA4C;IAC5C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC,CAAC;IAC3D,MAAM,OAAO,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAC5F,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,2BAA2B,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACtE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IACD,SAAS,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAClG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC,CAAC;IAExD,gBAAgB;IAChB,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,EAAE,2BAA2B,EAAE,CAAC,CAAC;IAExE,oBAAoB;IACpB,OAAO,CAAC,GAAG,EAAE,CAAC;IACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC,CAAC;IACpD,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,EAAE,YAAY,CAAC,EAAE,4BAA4B,EAAE,CAAC,CAAC;IAC1F,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,EAAE,mBAAmB,CAAC,EAAE,kCAAkC,CAAC,WAAW,CAAC,CAAC,CAAC;IAElH,kFAAkF;IAClF,iFAAiF;IACjF,gFAAgF;IAChF,gFAAgF;IAChF,gEAAgE;IAChE,MAAM,UAAU,GAAG,iBAAiB,EAAE,CAAC;IACvC,IAAI,UAAU,EAAE,CAAC;QACf,SAAS,CACP,IAAI,CAAC,SAAS,EAAE,eAAe,EAAE,0BAA0B,CAAC,EAC5D,sCAAsC,CAAC,UAAU,CAAC,CACnD,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,MAAM,CACV,6GAA6G;YAC3G,0EAA0E,CAC7E,CACF,CAAC;IACJ,CAAC;IAED,MAAM,cAAc,GAAG,IAAI,CAAC,SAAS,EAAE,eAAe,EAAE,gBAAgB,CAAC,CAAC;IAC1E,SAAS,CAAC,cAAc,EAAE,8BAA8B,CAAC,WAAW,CAAC,CAAC,CAAC;IACvE,IAAI,CAAC;QAAC,SAAS,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC;IAEnE,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC;IACxE,SAAS,CAAC,aAAa,EAAE,6BAA6B,CAAC,WAAW,CAAC,CAAC,CAAC;IACrE,IAAI,CAAC;QAAC,SAAS,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC;IAElE,yFAAyF;IACzF,OAAO,CAAC,GAAG,EAAE,CAAC;IACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC,CAAC;IAC3D,MAAM,OAAO,CAAC;QACZ,WAAW,EAAE,SAAS;QACtB,WAAW,EAAE,WAAW;QACxB,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,YAAY,EAAE,OAAO,CAAC,YAAY;QAClC,sBAAsB;QACtB,aAAa,EAAE,IAAI;KACpB,CAAC,CAAC;IAEH,kCAAkC;IAClC,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,EAAE,uBAAuB,CAAC,aAAa,CAAC,CAAC;IAC7E,SAAS,CAAC,aAAa,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9C,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,iBAAiB,CAAC,EAAE,sBAAsB,CAAC,CAAC;IAE1E,oFAAoF;IACpF,qFAAqF;IACrF,kFAAkF;IAClF,oEAAoE;IACpE,OAAO,CAAC,GAAG,EAAE,CAAC;IACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC,CAAC;IAEvD,oFAAoF;IACpF,+DAA+D;IAC/D,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE;QAC7E,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM;KACjC,CAAC,CAAC;IACH,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,WAAW,CAAC,EAAE;QAC3E,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM;KACjC,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAClF,MAAM,WAAW,GAAG,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAC/E,IAAI,YAAY,IAAI,WAAW,EAAE,CAAC;QAChC,IAAI,WAAW,EAAE,CAAC;YAChB,SAAS,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QACvG,CAAC;QACD,IAAI,YAAY,EAAE,CAAC;YACjB,SAAS,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QAC3G,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,qFAAqF,CAAC,CAAC,CAAC;IAChH,CAAC;IAED,SAAS,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IACnE,MAAM,MAAM,GAAG,SAAS,CACtB,KAAK,EACL,CAAC,QAAQ,EAAE,IAAI,EAAE,kBAAkB,WAAW,gBAAgB,CAAC,EAC/D,EAAE,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CACrD,CAAC;IACF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC,CAAC;QACpE,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,iBAAiB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;QACpE,CAAC;QACD,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,0BAA0B,SAAS,6BAA6B,WAAW,IAAI,CAAC,CAAC,CAAC;QAC1G,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAE/C,yEAAyE;IACzE,0EAA0E;IAC1E,2DAA2D;IAC3D,OAAO,CAAC,GAAG,EAAE,CAAC;IACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC,CAAC;IAChE,MAAM,gBAAgB,GAAG,SAAS,CAChC,OAAO,CAAC,QAAQ,EAChB;QACE,GAAG,OAAO,CAAC,QAAQ;QACnB,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,UAAU,CAAC;QACjC,aAAa,EAAE,SAAS,EAAE,SAAS,EAAE,eAAe;KACrD,EACD,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,CAC9E,CAAC;IACF,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC,CAAC;QAChE,mCAAmC;QACnC,IAAI,CAAC;YACH,SAAS,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;YACnE,SAAS,CACP,KAAK,EACL,CAAC,QAAQ,EAAE,IAAI,EAAE,sDAAsD,CAAC,EACxE,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,CAClC,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,kDAAkD;QACpD,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,sEAAsE,CAAC,CAAC,CAAC;QAClG,IAAI,gBAAgB,CAAC,MAAM,EAAE,CAAC;YAC5B,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,gBAAgB,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACjF,CAAC;IACH,CAAC;IAED,gFAAgF;IAChF,EAAE;IACF,4EAA4E;IAC5E,8EAA8E;IAC9E,4EAA4E;IAC5E,2EAA2E;IAC3E,wEAAwE;IACxE,4EAA4E;IAC5E,oBAAoB;IACpB,OAAO,CAAC,GAAG,EAAE,CAAC;IACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC,CAAC;IACzD,MAAM,oBAAoB,GAAG,IAAI,CAAC,uBAAuB,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;IAC5F,IAAI,gBAAgB,GAAkB,IAAI,CAAC;IAC3C,IAAI,CAAC;QACH,MAAM,SAAS,CAAC;YACd,SAAS,EAAE,oBAAoB;YAC/B,IAAI,EAAE,cAAc;YACpB,WAAW,EAAE,SAAS;YACtB,6BAA6B,EAAE,OAAO,CAAC,6BAA6B;SACrE,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC,CAAC;IAC3D,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,gBAAgB,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACpE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,yCAAyC,gBAAgB,EAAE,CAAC,CAAC,CAAC;QACvF,4EAA4E;QAC5E,yEAAyE;QACzE,uEAAuE;QACvE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,oDAAoD,gBAAgB,CAAC,oBAAoB,CAAC,sBAAsB,CAAC,CAAC,CAAC;QACzI,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,2EAA2E,CAAC,CAAC,CAAC;QACpG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,uDAAuD,CAAC,CAAC,CAAC;QAChF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,wDAAwD,CAAC,CAAC,CAAC;IACnF,CAAC;IAGD,oDAAoD;IACpD,EAAE;IACF,4EAA4E;IAC5E,8EAA8E;IAC9E,8EAA8E;IAC9E,2EAA2E;IAC3E,yEAAyE;IACzE,mDAAmD;IACnD,EAAE;IACF,2EAA2E;IAC3E,6EAA6E;IAC7E,6EAA6E;IAC7E,sEAAsE;IACtE,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,MAAM,eAAe,GAAG,IAAI,CAAC,uBAAuB,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;QAClF,MAAM,OAAO,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,UAAU,EAAE,iBAAiB,EAAE,IAAI,EAAE,eAAe,CAAC,EAAE;YACvF,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM;SAC9B,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;QAChB,IAAI,CAAC,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC;YAC7D,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,eAAe,CAAC,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;YACnG,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACxB,SAAS,CACP,KAAK,EACL,CAAC,QAAQ,EAAE,IAAI,EAAE,2CAA2C,CAAC,EAC7D,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,CAClC,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,oEAAoE;IACpE,8DAA8D;IAC9D,EAAE;IACF,yEAAyE;IACzE,4EAA4E;IAC5E,kCAAkC;IAClC,IAAI,SAAS,GAAkB,IAAI,CAAC;IACpC,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,SAAS,EAAE,WAAW,EAAE;QACnE,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;KAC3C,CAAC,CAAC;IACH,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QACvB,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,IAAI,YAAY,CAAC,OAAO,EAAE,CAAC;YACzB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC,CAAC;YACjE,kDAAkD;YAClD,MAAM,YAAY,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,CAAC,EAAE;gBACtF,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM;aACjC,CAAC,CAAC;YACH,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC9B,SAAS,GAAG,CAAC,YAAY,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC;YACzD,CAAC;QACH,CAAC;aAAM,IAAI,YAAY,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;YAChD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,yCAAyC,CAAC,CAAC,CAAC;QACvE,CAAC;aAAM,IAAI,YAAY,CAAC,MAAM,KAAK,oBAAoB,EAAE,CAAC;YACxD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,sEAAsE,CAAC,CAAC,CAAC;QACpG,CAAC;aAAM,IAAI,YAAY,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;YAC/C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,kDAAkD,CAAC,CAAC,CAAC;YAC9E,IAAI,YAAY,CAAC,MAAM,EAAE,CAAC;gBACxB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC;YAC9D,CAAC;QACH,CAAC;IACH,CAAC;IAED,gBAAgB;IAChB,EAAE;IACF,gFAAgF;IAChF,iFAAiF;IACjF,iFAAiF;IACjF,kFAAkF;IAClF,8EAA8E;IAC9E,oEAAoE;IACpE,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO,CAAC,GAAG,EAAE,CAAC;QACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC,CAAC;QACxF,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACzC,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,KAAK,MAAM,IAAI,IAAI,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC;YAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACrE,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,4EAA4E;QAC5E,4EAA4E;QAC5E,MAAM,mBAAmB,GAAG,gBAAgB,CAC1C,SAAS,EACT,cAAc,EACd,OAAO,CAAC,WAAW,IAAI,uBAAuB,CAAC,WAAW,CAC3D,CAAC;QACF,IAAI,mBAAmB,EAAE,CAAC;YACxB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,mBAAmB,SAAS,8BAA8B,CAAC,CAAC;YACzG,OAAO,CAAC,KAAK,CAAC,qDAAqD,mBAAmB,GAAG,CAAC,CAAC;YAC3F,OAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAC1D,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,mBAAmB,SAAS,kCAAkC,CAAC,CAAC;YAC7G,OAAO,CAAC,KAAK,CAAC,qFAAqF,CAAC,CAAC;QACvG,CAAC;QACD,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,MAAM,cAAc,GAAG,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;QAC/D,IAAI,cAAc,EAAE,CAAC;YACnB,KAAK,MAAM,IAAI,IAAI,cAAc;gBAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACvD,OAAO,CAAC,KAAK,EAAE,CAAC;QAClB,CAAC;QACD,IAAI,4BAA4B,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACnD,0EAA0E;YAC1E,0EAA0E;YAC1E,gDAAgD;YAChD,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,mDAAmD,CAAC,CAAC;YAChG,OAAO,CAAC,KAAK,CAAC,8EAA8E,CAAC,CAAC;YAC9F,OAAO,CAAC,KAAK,CAAC,8DAA8D,CAAC,CAAC;YAC9E,OAAO,CAAC,KAAK,CAAC,SAAS,KAAK,CAAC,IAAI,CAAC,MAAM,gBAAgB,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YAC1E,OAAO,CAAC,KAAK,CAAC,SAAS,KAAK,CAAC,IAAI,CAAC,kCAAkC,gBAAgB,CAAC,oBAAoB,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;QACvI,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;YAC1C,OAAO,CAAC,KAAK,CAAC,SAAS,KAAK,CAAC,IAAI,CAAC,MAAM,gBAAgB,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YAC1E,OAAO,CAAC,KAAK,CAAC,SAAS,KAAK,CAAC,IAAI,CAAC,kCAAkC,gBAAgB,CAAC,oBAAoB,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;QACvI,CAAC;QACD,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,4EAA4E;QAC5E,sEAAsE;QACtE,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,OAAO,CAAC,GAAG,EAAE,CAAC;IACd,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAC1H,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACvC,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC,CAAC;IACpE,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC,CAAC;IAClE,OAAO,CAAC,GAAG,EAAE,CAAC;IACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;IACzC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,CAAC,IAAI,CAAC,MAAM,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC;IACvD,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,WAAW,KAAK,CAAC,GAAG,CAAC,0BAA0B,CAAC,EAAE,CAAC,CAAC;IACvG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC,OAAO,KAAK,CAAC,GAAG,CAAC,oCAAoC,CAAC,EAAE,CAAC,CAAC;IACjH,OAAO,CAAC,GAAG,EAAE,CAAC;IACd,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,mEAAmE,CAAC,CAAC,CAAC;IAC5F,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,oEAAoE,CAAC,CAAC,CAAC;IAC7F,OAAO,CAAC,GAAG,EAAE,CAAC;IACd,IAAI,YAAY,CAAC,OAAO,IAAI,SAAS,EAAE,CAAC;QACtC,MAAM,QAAQ,GAAG,SAAS,CAAC,UAAU,CAAC,iBAAiB,CAAC;YACtD,CAAC,CAAC,sBAAsB,SAAS,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,EAAE;YACzF,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACpC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,4BAA4B,QAAQ,EAAE,CAAC,CAAC,CAAC;QAC/D,OAAO,CAAC,GAAG,EAAE,CAAC;IAChB,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,gFAAgF,CAAC,CAAC,CAAC;QACzG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC,CAAC;QACxD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,oBAAoB,SAAS,0BAA0B,CAAC,CAAC,CAAC;QAChF,OAAO,CAAC,GAAG,EAAE,CAAC;IAChB,CAAC;AACH,CAAC"}
@@ -0,0 +1,99 @@
1
+ /**
2
+ * Commit a scaffolded project's catalog entry, then bring the team worktree up
3
+ * to that commit (#607).
4
+ *
5
+ * WHY THIS EXISTS. A project with zero remotes (`mx-agent new project` builds
6
+ * one) has no base branch anywhere but its own. Provisioning wrote the team's
7
+ * catalog entry into the project root and copied it into the new worktree, both
8
+ * untracked, so the entry waited one `git add -A` away in two trees and every
9
+ * later read of the base branch missed it. This module commits that one path on
10
+ * the base branch and fast-forwards the team worktree's branch to the commit, so
11
+ * both trees end clean and the entry is tracked in both.
12
+ *
13
+ * ORDER, and the reason for it (#607 plan revision 4):
14
+ * 1. Pre-flight. Nothing is written to git until every check passes: HEAD is
15
+ * `refs/heads/<base>`, an author AND a committer identity resolve, no
16
+ * untracked file at the entry path in the worktree differs from the bytes
17
+ * to be committed, and the worktree's HEAD is an ancestor of the base
18
+ * branch (its branch has no commits of its own).
19
+ * 2. Commit: `git add -- <path>`, then `git commit --only -- <path>`, so
20
+ * anything else the operator has staged is not swept in. On failure,
21
+ * `git reset -q -- <path>` removes only this path from the index. The state
22
+ * is then the same as a pre-flight failure: entry untracked, nothing staged.
23
+ * 3. Worktree: remove a byte-identical untracked copy, then
24
+ * `git -C <worktree> merge --ff-only refs/heads/<base>`. A failure here is a
25
+ * stated partial state: the entry is committed on the base branch, the
26
+ * worktree is one or more commits behind it, and the one command that
27
+ * finishes the job is named.
28
+ *
29
+ * WHAT IT NEVER DOES. It sets no git identity, passes no `--no-verify`, and
30
+ * reads no configuration of its own: the operator's hooks and signing run as
31
+ * they would for the operator's own `git commit`. An identity git derives from
32
+ * the hostname is accepted, because it is what that commit would use too.
33
+ *
34
+ * Nothing here prints. Every outcome is returned, and the caller names the step.
35
+ * Every git call is an argv array, never a shell string.
36
+ */
37
+ /** Why the commit was not attempted, or did not hold. One per pre-flight check, plus the two git steps. */
38
+ export type CatalogCommitCause = 'head-not-on-base' | 'no-identity' | 'differing-copy' | 'worktree-has-own-commits' | 'commit-failed' | 'unreadable';
39
+ export type CatalogCommitOutcome =
40
+ /** This run committed the entry on the base branch and the worktree holds that commit. */
41
+ {
42
+ kind: 'committed';
43
+ sha: string;
44
+ }
45
+ /**
46
+ * The entry was already on the base branch, so nothing was committed. `worktreeUpdated`
47
+ * says whether this run fast-forwarded the worktree to it.
48
+ */
49
+ | {
50
+ kind: 'already-tracked';
51
+ worktreeUpdated: boolean;
52
+ }
53
+ /**
54
+ * Nothing was staged or committed. The caller writes the entry, copies it, and
55
+ * names the step. `detail` is one line for the operator.
56
+ */
57
+ | {
58
+ kind: 'not-committed';
59
+ cause: CatalogCommitCause;
60
+ detail: string;
61
+ }
62
+ /**
63
+ * The entry IS on the base branch, and the worktree was not brought up to it.
64
+ * No copy belongs in the worktree: the named step is the one merge command.
65
+ */
66
+ | {
67
+ kind: 'worktree-behind';
68
+ sha: string | null;
69
+ detail: string;
70
+ worktreeHasOwnCommits: boolean;
71
+ };
72
+ export interface CatalogCommitInput {
73
+ projectRoot: string;
74
+ worktreePath: string;
75
+ baseBranch: string;
76
+ /** The entry's path relative to the project root, `/`-separated. */
77
+ relPath: string;
78
+ /** The commit message. */
79
+ message: string;
80
+ /** Test seam: the environment every git call runs with. Defaults to this process's. */
81
+ env?: NodeJS.ProcessEnv;
82
+ /** Test seam: how long one git call may run. Defaults to CATALOG_COMMIT_GIT_TIMEOUT_MS. */
83
+ timeoutMs?: number;
84
+ }
85
+ /**
86
+ * How long one git call here may run before it is stopped (#610 red-team).
87
+ *
88
+ * The operator's hooks and signing run on this commit, so a signing prompt or an
89
+ * interactive hook could otherwise hold `new project` open with no output. Each
90
+ * git call gets this long, with stdin closed so nothing waits on the terminal.
91
+ * A call that is stopped fails like any other failed call: the commit path
92
+ * returns `not-committed` with cause `commit-failed`, and the caller writes the
93
+ * entry uncommitted and names the step.
94
+ */
95
+ export declare const CATALOG_COMMIT_GIT_TIMEOUT_MS = 60000;
96
+ /** The first non-empty line of git's output, with control characters removed and a length cap. */
97
+ export declare function firstGitLine(text: string): string;
98
+ export declare function commitCatalogEntry(i: CatalogCommitInput): CatalogCommitOutcome;
99
+ //# sourceMappingURL=catalog-commit.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"catalog-commit.d.ts","sourceRoot":"","sources":["../../src/lib/catalog-commit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AAOH,2GAA2G;AAC3G,MAAM,MAAM,kBAAkB,GAC1B,kBAAkB,GAClB,aAAa,GACb,gBAAgB,GAChB,0BAA0B,GAC1B,eAAe,GACf,YAAY,CAAC;AAEjB,MAAM,MAAM,oBAAoB;AAC9B,0FAA0F;AACxF;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE;AACpC;;;GAGG;GACD;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,eAAe,EAAE,OAAO,CAAA;CAAE;AACvD;;;GAGG;GACD;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,KAAK,EAAE,kBAAkB,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE;AACtE;;;GAGG;GACD;IAAE,IAAI,EAAE,iBAAiB,CAAC;IAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,qBAAqB,EAAE,OAAO,CAAA;CAAE,CAAC;AAEpG,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,oEAAoE;IACpE,OAAO,EAAE,MAAM,CAAC;IAChB,0BAA0B;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,uFAAuF;IACvF,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,2FAA2F;IAC3F,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,6BAA6B,QAAS,CAAC;AAUpD,kGAAkG;AAClG,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAKjD;AAED,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,kBAAkB,GAAG,oBAAoB,CA2P9E"}