@memnexus-ai/mx-agent-cli 0.1.299 → 0.1.301

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.
@@ -54,8 +54,9 @@ export interface TeamEntry {
54
54
  * #112 comment 5383968476).
55
55
  *
56
56
  * `serializeTeamEntry` never writes the field, so `mx-agent new team` cannot
57
- * produce it. It exists only through a human edit to the catalog file
58
- * (MC-5, #112 comment 5383997130).
57
+ * produce it. The field exists through a human edit, or through the single
58
+ * `new project` path for slug `team-builder` (MC-5, #112 comment 5383997130,
59
+ * as amended by #828; `serializeNewProjectTeamBuilderEntry`).
59
60
  */
60
61
  interaction: TeamInteraction;
61
62
  /**
@@ -139,6 +140,21 @@ export declare function slugToDisplayName(slug: string): string;
139
140
  * Serialise a TeamEntry to markdown (matches the format of pipeline.md).
140
141
  */
141
142
  export declare function serializeTeamEntry(entry: TeamEntry): string;
143
+ /**
144
+ * The entry `mx-agent new project` writes for its own team-builder (#828).
145
+ *
146
+ * `serializeTeamEntry`'s bytes plus one constant line after `Goal:`. It is a
147
+ * separate function so that the serializer every other path uses stays unable
148
+ * to produce the field (MC-5). The value is a constant: `entry.interaction` is
149
+ * never read.
150
+ *
151
+ * WHY NOT `Status: dormant`, which this repository's entry holds (#828 S4). A
152
+ * new project's team-builder is an enqueue target once it registers (#507), so
153
+ * the line would be untrue there, and nothing in a generated project reads it.
154
+ *
155
+ * Two callers: the fresh write `create.ts` guards, and row 2's comparison.
156
+ */
157
+ export declare function serializeNewProjectTeamBuilderEntry(entry: TeamEntry): string;
142
158
  /**
143
159
  * The shape of a named memory key: lowercase kebab-case and nothing else.
144
160
  *
@@ -313,39 +329,10 @@ export declare function roleguideOnRef(projectRoot: string, roleguideRelPath: st
313
329
  * Exported for the test that enumerates the refusals.
314
330
  */
315
331
  export declare function isReadableRepoPath(path: string): boolean;
316
- /**
317
- * The team's `Interaction:` answer on the base branch at `origin`, as three
318
- * outcomes (#112 C2).
319
- *
320
- * `mx-agent start` calls this once per session and writes the answer to a
321
- * state file the Stop hook reads, so the hook runs no git command and no
322
- * network call on the path a session stops through (MC-3, #112 comment
323
- * 5383997130; `session-idle-gate.sh:29-32` forbids a network call there).
324
- *
325
- * `unresolvable` never reads as `interactive`. A failed fetch, a ref that does
326
- * not resolve, a slug that fails `TEAM_SLUG_RE`, a blob that will not read: all
327
- * of them answer `unresolvable`, and the hook challenges the stop on that
328
- * answer exactly as it does on `non-interactive`.
329
- *
330
- * `origin/main` is a guardrail-grade anchor and NOT an access control (F12,
331
- * MC-6). It is better than the working tree because a change to it passed
332
- * review. It is not a boundary: any process with write access to `.git` moves
333
- * a remote-tracking ref with one command, at the same privilege the session
334
- * already holds, and `git-mutation-guard.sh` states the same about itself.
335
- *
336
- * The hook's bound on how many stops the stand-down covers contains that on the
337
- * honest path only (red-team finding 3, PR #113 comment 5386223077). The bound
338
- * is a counter in a file the session owns, so a session that moves the ref AND
339
- * rewrites that file removes the declaration check and the bound together, at
340
- * its own privilege, and neither this read nor the hook prevents it. That
341
- * combined residual is accepted for the team-builder alone and tracked as #114.
342
- * What remains is the log, which records rather than prevents.
343
- *
344
- * Reads a local ref. Runs no network call, writes nothing, prints nothing.
345
- */
346
332
  export declare function teamInteractionOnOriginMain(projectRoot: string, slug: string, teamsDir?: string, opts?: {
347
333
  baseBranch?: string;
348
334
  fetchOk?: boolean;
335
+ localBase?: boolean;
349
336
  }): TeamInteraction | 'unresolvable';
350
337
  /**
351
338
  * The team's `Interaction:` answer in the entry `ref` holds, same three
@@ -380,4 +367,9 @@ export declare function isReadableCatalogRef(ref: string): boolean;
380
367
  * Write a team catalog entry (creates the file).
381
368
  */
382
369
  export declare function writeTeamCatalog(projectRoot: string, entry: TeamEntry, teamsDir?: string): void;
370
+ /**
371
+ * Write the entry `new project` gives its own team-builder (#828). The one
372
+ * caller is the guarded branch of `catalogEntryStep` in `create.ts`.
373
+ */
374
+ export declare function writeNewProjectTeamBuilderCatalog(projectRoot: string, entry: TeamEntry, teamsDir?: string): void;
383
375
  //# sourceMappingURL=catalog.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../../src/lib/catalog.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../../src/lib/catalog.ts"],"names":[],"mappings":"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"}
@@ -88,7 +88,9 @@ export function serializeTeamEntry(entry) {
88
88
  // `entry.interaction` holds. The idle gate stands down for a team whose
89
89
  // entry declares `interactive`, so a serializer that emitted the field would
90
90
  // let `mx-agent new team` grant that stand-down to a team nobody reviewed
91
- // (MC-5, #112 comment 5383997130). The field is a human edit, and
91
+ // (MC-5, #112 comment 5383997130). The field exists through a human edit, or
92
+ // through the single `new project` path for slug `team-builder`, and that path
93
+ // uses `serializeNewProjectTeamBuilderEntry`, never this function.
92
94
  // `serializeTeamEntry-never-emits` in catalog-interaction.test.ts asserts it.
93
95
  return `# Team: ${entry.slug}
94
96
 
@@ -100,6 +102,23 @@ ${goalLine}${agentTypeLine}
100
102
  ${memoriesList}
101
103
  `;
102
104
  }
105
+ /**
106
+ * The entry `mx-agent new project` writes for its own team-builder (#828).
107
+ *
108
+ * `serializeTeamEntry`'s bytes plus one constant line after `Goal:`. It is a
109
+ * separate function so that the serializer every other path uses stays unable
110
+ * to produce the field (MC-5). The value is a constant: `entry.interaction` is
111
+ * never read.
112
+ *
113
+ * WHY NOT `Status: dormant`, which this repository's entry holds (#828 S4). A
114
+ * new project's team-builder is an enqueue target once it registers (#507), so
115
+ * the line would be untrue there, and nothing in a generated project reads it.
116
+ *
117
+ * Two callers: the fresh write `create.ts` guards, and row 2's comparison.
118
+ */
119
+ export function serializeNewProjectTeamBuilderEntry(entry) {
120
+ return serializeTeamEntry(entry).replace(/^Goal: .*\n/m, (goalLine) => `${goalLine}Interaction: interactive\n`);
121
+ }
103
122
  /**
104
123
  * The shape of a named memory key: lowercase kebab-case and nothing else.
105
124
  *
@@ -475,8 +494,10 @@ export function isReadableRepoPath(path) {
475
494
  return path.split('/').every((part) => part.length > 0 && !part.startsWith('.'));
476
495
  }
477
496
  /**
478
- * The team's `Interaction:` answer on the base branch at `origin`, as three
479
- * outcomes (#112 C2).
497
+ * The team's `Interaction:` answer, as three outcomes (#112 C2). The ref read is
498
+ * `origin/<base>`, or `refs/heads/<base>` when the caller passes `localBase` for
499
+ * a project with no remotes (#828). Nothing else is ever read: not `HEAD`, not
500
+ * the working tree.
480
501
  *
481
502
  * `mx-agent start` calls this once per session and writes the answer to a
482
503
  * state file the Stop hook reads, so the hook runs no git command and no
@@ -488,12 +509,19 @@ export function isReadableRepoPath(path) {
488
509
  * of them answer `unresolvable`, and the hook challenges the stop on that
489
510
  * answer exactly as it does on `non-interactive`.
490
511
  *
491
- * `origin/main` is a guardrail-grade anchor and NOT an access control (F12,
512
+ * `origin/<base>` is a guardrail-grade anchor and NOT an access control (F12,
492
513
  * MC-6). It is better than the working tree because a change to it passed
493
514
  * review. It is not a boundary: any process with write access to `.git` moves
494
515
  * a remote-tracking ref with one command, at the same privilege the session
495
516
  * already holds, and `git-mutation-guard.sh` states the same about itself.
496
517
  *
518
+ * THE LOCAL BASE IS WEAKER THAN THAT (#828 S3). On zero remotes the local base
519
+ * is unreviewed, any worktree can move it, and `git remote remove origin`
520
+ * reaches this read. So the read is pinned to one slug, `team-builder`, and
521
+ * every other slug answers `unresolvable`: the pin limits what a moved ref can
522
+ * grant. The caller decides `localBase` from `listRemotes`, and only an empty
523
+ * list sets it (M2): a failed fetch never falls back here.
524
+ *
497
525
  * The hook's bound on how many stops the stand-down covers contains that on the
498
526
  * honest path only (red-team finding 3, PR #113 comment 5386223077). The bound
499
527
  * is a counter in a file the session owns, so a session that moves the ref AND
@@ -504,12 +532,27 @@ export function isReadableRepoPath(path) {
504
532
  *
505
533
  * Reads a local ref. Runs no network call, writes nothing, prints nothing.
506
534
  */
535
+ /** The one slug whose `Interaction:` answer may come from the local base (#828 M1). */
536
+ const LOCAL_BASE_INTERACTION_SLUG = 'team-builder';
507
537
  export function teamInteractionOnOriginMain(projectRoot, slug, teamsDir = 'mx-agent-system/teams', opts = {}) {
508
538
  // The slug is validated BEFORE any git call, including the existence check
509
539
  // below, which interpolates it into a revision string (F4). A slug that names
510
540
  // no team is a could-not-run, not an absent entry.
511
541
  if (!TEAM_SLUG_RE.test(slug))
512
542
  return 'unresolvable';
543
+ if (opts.localBase === true) {
544
+ // M1: pinned here, inside the reader, so no caller can widen it.
545
+ if (slug !== LOCAL_BASE_INTERACTION_SLUG)
546
+ return 'unresolvable';
547
+ // M3: the full ref form, so `HEAD` and the working tree cannot answer.
548
+ const localRef = `refs/heads/${opts.baseBranch?.trim() || 'main'}`;
549
+ const onLocal = catalogEntryOnRef(projectRoot, slug, localRef, teamsDir);
550
+ if (onLocal === 'unresolvable')
551
+ return 'unresolvable';
552
+ if (onLocal === 'absent')
553
+ return 'non-interactive';
554
+ return teamInteractionOnRef(projectRoot, slug, localRef, teamsDir);
555
+ }
513
556
  // Existence next, through the reader that already holds the fetch gate: a
514
557
  // remote-tracking ref left by an earlier fetch is of unknown age, so
515
558
  // `fetchOk !== true` settles the answer before any ref is read.
@@ -594,10 +637,19 @@ export function isReadableCatalogRef(ref) {
594
637
  * Write a team catalog entry (creates the file).
595
638
  */
596
639
  export function writeTeamCatalog(projectRoot, entry, teamsDir = 'mx-agent-system/teams') {
640
+ writeCatalogBytes(projectRoot, entry.slug, serializeTeamEntry(entry), teamsDir);
641
+ }
642
+ /**
643
+ * Write the entry `new project` gives its own team-builder (#828). The one
644
+ * caller is the guarded branch of `catalogEntryStep` in `create.ts`.
645
+ */
646
+ export function writeNewProjectTeamBuilderCatalog(projectRoot, entry, teamsDir = 'mx-agent-system/teams') {
647
+ writeCatalogBytes(projectRoot, entry.slug, serializeNewProjectTeamBuilderEntry(entry), teamsDir);
648
+ }
649
+ function writeCatalogBytes(projectRoot, slug, bytes, teamsDir) {
597
650
  const dir = getTeamsCatalogDir(projectRoot, teamsDir);
598
651
  if (!existsSync(dir))
599
652
  mkdirSync(dir, { recursive: true });
600
- const path = getTeamCatalogPath(projectRoot, entry.slug, teamsDir);
601
- writeFileSync(path, serializeTeamEntry(entry));
653
+ writeFileSync(getTeamCatalogPath(projectRoot, slug, teamsDir), bytes);
602
654
  }
603
655
  //# sourceMappingURL=catalog.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../src/lib/catalog.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../src/lib/catalog.ts"],"names":[],"mappings":"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"}
@@ -51,11 +51,14 @@ export interface MaybeCreateRemoteOptions {
51
51
  withRemote?: boolean;
52
52
  remoteVisibility?: RemoteVisibility;
53
53
  }
54
- export type RemoteReason = 'not-requested' | 'gh-missing' | 'gh-version-failed' | 'gh-unauthenticated' | 'gh-timed-out' | 'gh-failed';
54
+ export type RemoteReason = 'not-requested' | 'gh-missing' | 'gh-version-failed' | 'gh-unauthenticated' | 'gh-timed-out' | 'gh-failed' | 'push-failed';
55
55
  export interface RemoteResult {
56
56
  created: boolean;
57
57
  reason?: RemoteReason;
58
+ /** What `gh repo create` wrote to stderr, safe to print: see `printable`. */
58
59
  stderr?: string;
60
+ /** The URL `gh` set on `origin`, safe to print. Set after a success and with reason 'push-failed'. */
61
+ repoUrl?: string;
59
62
  }
60
63
  export type SpawnSyncFn = (command: string, args: readonly string[], options?: SpawnSyncOptions) => {
61
64
  status: number | null;
@@ -1 +1 @@
1
- {"version":3,"file":"gh-remote.d.ts","sourceRoot":"","sources":["../../src/lib/gh-remote.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAa,KAAK,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjE,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG,SAAS,CAAC;AAEpD;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,EACX,MAAM,SAAW,EACjB,KAAK,GAAE,WAAuB,GAC7B,MAAM,GAAG,IAAI,CAyBf;AAED;;;;GAIG;AACH,eAAO,MAAM,wBAAwB;;;CAG3B,CAAC;AAEX;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAInE;AAED,MAAM,WAAW,wBAAwB;IACvC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC;AAED,MAAM,MAAM,YAAY,GACpB,eAAe,GACf,YAAY,GACZ,mBAAmB,GACnB,oBAAoB,GACpB,cAAc,GACd,WAAW,CAAC;AAEhB,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAGD,MAAM,MAAM,WAAW,GAAG,CACxB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,CAAC,EAAE,gBAAgB,KACvB;IAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC;AAElG;;;GAGG;AACH,eAAO,MAAM,mBAAmB,QAAS,CAAC;AAE1C,iEAAiE;AACjE,MAAM,MAAM,cAAc,GAAG,YAAY,GAAG,mBAAmB,GAAG,oBAAoB,GAAG,cAAc,CAAC;AAMxG;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAC1B,KAAK,GAAE,WAAuB,EAC9B,SAAS,GAAE,MAA4B,GACtC,cAAc,GAAG,IAAI,CAqBvB;AAED,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,wBAAwB,EACjC,KAAK,GAAE,WAAuB,GAC7B,OAAO,CAAC,YAAY,CAAC,CA0DvB"}
1
+ {"version":3,"file":"gh-remote.d.ts","sourceRoot":"","sources":["../../src/lib/gh-remote.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAa,KAAK,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGjE,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG,SAAS,CAAC;AAEpD;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,EACX,MAAM,SAAW,EACjB,KAAK,GAAE,WAAuB,GAC7B,MAAM,GAAG,IAAI,CAyBf;AAED;;;;GAIG;AACH,eAAO,MAAM,wBAAwB;;;CAG3B,CAAC;AAEX;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAInE;AAED,MAAM,WAAW,wBAAwB;IACvC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC;AAED,MAAM,MAAM,YAAY,GACpB,eAAe,GACf,YAAY,GACZ,mBAAmB,GACnB,oBAAoB,GACpB,cAAc,GACd,WAAW,GACX,aAAa,CAAC;AAElB,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,6EAA6E;IAC7E,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,sGAAsG;IACtG,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAGD,MAAM,MAAM,WAAW,GAAG,CACxB,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,CAAC,EAAE,gBAAgB,KACvB;IAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAA;CAAE,CAAC;AAElG;;;GAGG;AACH,eAAO,MAAM,mBAAmB,QAAS,CAAC;AAE1C,iEAAiE;AACjE,MAAM,MAAM,cAAc,GAAG,YAAY,GAAG,mBAAmB,GAAG,oBAAoB,GAAG,cAAc,CAAC;AAqBxG;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAC1B,KAAK,GAAE,WAAuB,EAC9B,SAAS,GAAE,MAA4B,GACtC,cAAc,GAAG,IAAI,CAqBvB;AAED,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,wBAAwB,EACjC,KAAK,GAAE,WAAuB,GAC7B,OAAO,CAAC,YAAY,CAAC,CAwEvB"}
@@ -13,6 +13,7 @@
13
13
  * gh auth output is never captured into memories or telemetry.
14
14
  */
15
15
  import { spawnSync } from 'child_process';
16
+ import { redactUrlCredentials, stripControlSequences } from './startup-report.js';
16
17
  /**
17
18
  * Resolve `owner/repo` from a git remote so callers never hardcode it.
18
19
  *
@@ -82,6 +83,20 @@ export function validateOwnerRepoShape(value) {
82
83
  * hanging `gh` would otherwise hold the command at its start with no output.
83
84
  */
84
85
  export const GH_PROBE_TIMEOUT_MS = 30_000;
86
+ /** A spawn stream as text. */
87
+ function streamText(stream) {
88
+ if (typeof stream === 'string')
89
+ return stream;
90
+ return stream ? stream.toString('utf-8') : undefined;
91
+ }
92
+ /**
93
+ * Text from `gh` or git, made safe to print. A configured URL can hold a token,
94
+ * and remote output can hold terminal control sequences. Controls go first, so
95
+ * one placed inside a URL cannot hide the URL from the redaction.
96
+ */
97
+ function printable(text) {
98
+ return redactUrlCredentials(stripControlSequences(text));
99
+ }
85
100
  function spawnErrorCode(result) {
86
101
  return result.error?.code;
87
102
  }
@@ -130,41 +145,54 @@ export async function maybeCreateRemote(outputDir, projectName, options, spawn =
130
145
  if (problem !== null) {
131
146
  return { created: false, reason: problem };
132
147
  }
133
- // 2. Create repo and push. stdio inherit so users see progress.
134
- const create = spawn('gh', ['repo', 'create', projectName, `--${visibility}`, `--source=${outputDir}`, '--remote=origin', '--push'], { encoding: 'utf-8', stdio: 'inherit' });
148
+ // A slow first push prints nothing until `gh` exits, so say that first.
149
+ console.log(' Running gh repo create and the first push. Their output appears when they finish.');
150
+ // 2. Create repo and push. stdout stays inherited. stderr is piped, because the
151
+ // caller needs it after a failure, so `gh` progress prints after exit, not live.
152
+ const create = spawn('gh', ['repo', 'create', projectName, `--${visibility}`, `--source=${outputDir}`, '--remote=origin', '--push'], { encoding: 'utf-8', stdio: ['inherit', 'inherit', 'pipe'] });
153
+ const createStderr = streamText(create.stderr);
154
+ const stderr = createStderr === undefined ? undefined : printable(createStderr);
155
+ const readOrigin = () => spawn('git', ['-C', outputDir, 'remote', 'get-url', 'origin'], {
156
+ encoding: 'utf-8',
157
+ stdio: 'pipe',
158
+ });
159
+ const originUrl = (read) => printable(streamText(read.stdout) ?? '').trim();
135
160
  if (create.status !== 0) {
136
- const stderr = typeof create.stderr === 'string'
137
- ? create.stderr
138
- : create.stderr
139
- ? create.stderr.toString('utf-8')
140
- : undefined;
141
- // Best-effort cleanup: `gh repo create --push` may have already run
142
- // `git remote add origin` before failing mid-push. Leaving a dangling
143
- // origin pointing at a non-existent or partially-created repo would
144
- // break subsequent manual remote setup. Probe first, then remove.
161
+ // `gh` adds `origin` only after it creates the repository (#816, read from
162
+ // its output, and from create.go on gh's trunk by red-team). So an `origin` here means this run created the
163
+ // repository and the push failed: `new project` refuses a non-empty
164
+ // directory, so a run starts with no `origin` of its own.
165
+ const probe = readOrigin();
166
+ const originExists = probe.status === 0;
167
+ // Best-effort cleanup. Leaving an `origin` on a repository with no branches
168
+ // would break subsequent manual remote setup.
145
169
  let cleanupStderr;
146
- const probe = spawn('git', ['-C', outputDir, 'remote', 'get-url', 'origin'], {
147
- encoding: 'utf-8',
148
- stdio: 'pipe',
149
- });
150
- if (probe.status === 0) {
170
+ if (originExists) {
151
171
  const remove = spawn('git', ['-C', outputDir, 'remote', 'remove', 'origin'], {
152
172
  encoding: 'utf-8',
153
173
  stdio: 'pipe',
154
174
  });
155
175
  if (remove.status !== 0) {
156
- cleanupStderr = typeof remove.stderr === 'string'
157
- ? remove.stderr
158
- : remove.stderr
159
- ? remove.stderr.toString('utf-8')
160
- : undefined;
176
+ cleanupStderr = printable(streamText(remove.stderr) ?? '');
161
177
  }
162
178
  }
163
- const combinedStderr = cleanupStderr
179
+ const combinedStderr = cleanupStderr !== undefined
164
180
  ? `${stderr ?? ''}${stderr ? '\n' : ''}cleanup: failed to remove dangling origin: ${cleanupStderr}`
165
181
  : stderr;
182
+ if (originExists) {
183
+ return {
184
+ created: false,
185
+ reason: 'push-failed',
186
+ repoUrl: originUrl(probe),
187
+ stderr: combinedStderr,
188
+ };
189
+ }
166
190
  return { created: false, reason: 'gh-failed', stderr: combinedStderr };
167
191
  }
168
- return { created: true };
192
+ // The only read of `origin` on this path. `git remote get-url` applies
193
+ // `insteadOf`, so its answer can hold a token (#840 security review).
194
+ const read = readOrigin();
195
+ const repoUrl = read.status === 0 ? originUrl(read) : '';
196
+ return { created: true, ...(repoUrl ? { repoUrl } : {}), ...(stderr ? { stderr } : {}) };
169
197
  }
170
198
  //# sourceMappingURL=gh-remote.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"gh-remote.js","sourceRoot":"","sources":["../../src/lib/gh-remote.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"gh-remote.js","sourceRoot":"","sources":["../../src/lib/gh-remote.ts"],"names":[],"mappings":"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"}