skillgauntlet 1.3.7 → 1.3.9

package/lib/i18n.js

@@ -275,6 +275,7 @@ const MESSAGES = {
     submitPrOpened: 'PR 已开：{url}',
     submitNext: '接下来：机器人要求时签 CLA，然后等 PR 里的 CI 留言。留言会写通过，或者精确写出缺什么。合并由维护者操作。',
     submitGhFail: 'GitHub 步骤失败：{msg}',
+    submitRetry: '这看起来是 GitHub 的临时故障，已经打包好的内容不会丢。现在重试吗？',
     modelRemap: '后端 {host} 会静默改写 Anthropic 模型名，"{model}" 测的不是你指定的模型；请传该后端自己的模型名',
     hostMissing: '没有找到宿主 {host}（PATH 里没有 {bin}）。{how}；也可以重新运行并选择其他宿主（Claude Code、CodeBuddy、Codewhale、Codex）。',
     installCodebuddy: '安装方法：npm install -g @tencent-ai/codebuddy-code',
@@ -709,6 +710,7 @@ Layer 0 always runs first: it is free, and it disqualifies most problems before
     submitPrOpened: 'Pull request opened: {url}',
     submitNext: 'Next: sign the CLA if the bot asks, then wait for the CI comment on the pull request. It says pass, or exactly what is missing. A maintainer does the merging.',
     submitGhFail: 'GitHub step failed: {msg}',
+    submitRetry: 'This looks like a temporary GitHub problem, and nothing already packaged is lost. Retry now?',
     modelRemap: 'backend {host} remaps Anthropic model names, so "{model}" would test a different model; pass that backend\'s own model id',
     hostMissing: 'Host {host} was not found ({bin} is not on PATH). {how}, or run again and pick another host (Claude Code, CodeBuddy, Codewhale, Codex).',
     installCodebuddy: 'To install: npm install -g @tencent-ai/codebuddy-code',
@@ -1019,6 +1021,7 @@ Layer 0 always runs first: it is free, and it disqualifies most problems before
     submitPrOpened: 'プルリクエストを開きました：{url}',
     submitNext: '次に、ボットに求められたら CLA に署名し、プルリクエストへの CI コメントを待ちます。コメントには合格か、何が足りないかが正確に書かれます。マージはメンテナが行います。',
     submitGhFail: 'GitHub の手順で失敗しました：{msg}',
+    submitRetry: 'GitHub の一時的な問題のようです。パッケージ済みの内容は失われません。今すぐ再試行しますか？',
     modelRemap: 'バックエンド {host} は Anthropic のモデル名を黙って書き換えるため、「{model}」では指定したモデルをテストできません。そのバックエンド自身のモデル名を指定してください',
     hostMissing: 'ホスト {host} が見つかりません（PATH に {bin} がありません）。{how}。または、もう一度実行して別のホスト（Claude Code、CodeBuddy、Codewhale、Codex）を選んでください。',
     installCodebuddy: 'インストール方法：npm install -g @tencent-ai/codebuddy-code',

package/lib/submit.js

@@ -92,15 +92,66 @@ function prBody(pkg) {
   ].join('\n');
 }
 
+// A fork that was just created is not always cloneable at once; try a few times, a few seconds apart.
+function cloneWithRetry(exec, url, dir, { tries = 5, waitMs = 3000 } = {}) {
+  let last;
+  for (let i = 0; i < tries; i += 1) {
+    try {
+      exec('git', ['clone', '--depth', '1', '-c', 'credential.helper=', '-c', 'credential.https://github.com.helper=!gh auth git-credential', url, dir]);
+      return;
+    } catch (err) {
+      last = err;
+      fs.rmSync(dir, { recursive: true, force: true });
+      if (i < tries - 1) Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, waitMs);
+    }
+  }
+  throw last;
+}
+
+const defaultSleep = (ms) => Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+
+// Server-side hiccups and network drops are worth another try; auth or validation errors are not.
+export function isTransient(err) {
+  const s = `${(err && err.stderr) || ''} ${(err && err.message) || ''}`;
+  return /HTTP 5\d\d|\b50[0-4]\b|timed? ?out|ETIMEDOUT|ECONNRESET|EAI_AGAIN|ENOTFOUND|unable to access|early EOF|RPC failed|Could not resolve host|rate limit/i.test(s);
+}
+
+// Run one GitHub step, retrying transient failures a few times with a growing pause.
+export function withRetry(fn, { attempts = 3, sleep = defaultSleep } = {}) {
+  for (let i = 1; ; i += 1) {
+    try { return fn(); } catch (err) {
+      if (i >= attempts || !isTransient(err)) throw err;
+      sleep(2000 * i);
+    }
+  }
+}
+
+// GitHub sometimes answers a fork request with a 5xx and creates the fork anyway, so look before giving up.
+function ensureFork({ gh, exec, sleep }) {
+  const exists = () => { try { exec('gh', ['repo', 'view', `${gh.user}/${UPSTREAM.split('/')[1]}`, '--json', 'name']); return true; } catch { return false; } };
+  try {
+    withRetry(() => exec('gh', ['repo', 'fork', UPSTREAM, '--clone=false']), { sleep });
+  } catch (err) {
+    for (let i = 0; i < 4 && !exists(); i += 1) sleep(3000);
+    if (!exists()) throw err;
+  }
+}
+
 // Fork, branch, commit, push, open. Every GitHub call goes through `exec` so tests can fake them.
-export function openPullRequest({ pkgDir, pkg, gh, exec = defaultExec, say: out = say }) {
+export function openPullRequest({ pkgDir, pkg, gh, exec = defaultExec, say: out = say, cloneWait = 3000, sleep = defaultSleep }) {
   const work = fs.mkdtempSync(path.join(os.tmpdir(), 'sg-pr-'));
+  const retry = (fn) => withRetry(fn, { sleep });
   try {
     out(t('submitForking', { upstream: UPSTREAM }));
-    exec('gh', ['repo', 'fork', UPSTREAM, '--clone=false']);
+    ensureFork({ gh, exec, sleep });
     out(t('submitPreparing'));
     const repoDir = path.join(work, 'repo');
-    exec('git', ['clone', '--depth', '1', `https://github.com/${UPSTREAM}.git`, repoDir]);
+    const forkUrl = `https://github.com/${gh.user}/${UPSTREAM.split('/')[1]}.git`;
+    // The branch is made from the contributor's own fork, not from upstream's main. A fork made before upstream gained
+    // workflow files lacks them, and pushing a branch built on upstream's main would then "create" those workflows in
+    // the fork, which GitHub refuses for a token without the `workflow` scope (the default gh sign-in has none). A branch
+    // made on the fork adds only the submission, and the pull request's diff against upstream is still just that.
+    cloneWithRetry(exec, forkUrl, repoDir, { waitMs: cloneWait });
     const g = (...a) => exec('git', ['-C', repoDir, ...a]);
     const branch = `submit/${slug(pkg.files.meta.skill)}-${pkg.files.meta.submission.host.id}-${pkg.path[2].split('-')[0].toLowerCase()}`;
     g('checkout', '-b', branch);
@@ -115,17 +166,23 @@ export function openPullRequest({ pkgDir, pkg, gh, exec = defaultExec, say: out
     const ident = ['-c', `user.name=${gh.user}`, '-c', `user.email=${gh.id}+${gh.user}@users.noreply.github.com`];
     g(...ident, 'commit', '-q', '-F', msg);
     out(t('submitPushing'));
-    g('remote', 'add', 'fork', `https://github.com/${gh.user}/${UPSTREAM.split('/')[1]}.git`);
-    g('-c', 'credential.helper=', '-c', 'credential.https://github.com.helper=!gh auth git-credential', 'push', '-q', 'fork', branch);
+    // a branch name left by an earlier attempt that died after the push is simply replaced (it is the contributor's own fork)
+    retry(() => g('-c', 'credential.helper=', '-c', 'credential.https://github.com.helper=!gh auth git-credential', 'push', '-q', '--force', 'origin', branch));
     out(t('submitOpening'));
     const body = path.join(work, 'body.md');
     fs.writeFileSync(body, prBody(pkg));
-    const url = exec('gh', [
-      'pr', 'create', '--repo', UPSTREAM, '--head', `${gh.user}:${branch}`, '--base', 'main',
-      '--title', `Submission: ${m.skill} on ${m.submission.host.id} / ${m.submission.model.resolved || m.submission.model.requested}`,
-      '--body-file', body,
-    ]).trim().split(/\s+/).pop();
-    return url;
+    try {
+      return retry(() => exec('gh', [
+        'pr', 'create', '--repo', UPSTREAM, '--head', `${gh.user}:${branch}`, '--base', 'main',
+        '--title', `Submission: ${m.skill} on ${m.submission.host.id} / ${m.submission.model.resolved || m.submission.model.requested}`,
+        '--body-file', body,
+      ])).trim().split(/\s+/).pop();
+    } catch (err) {
+      // an earlier attempt may have opened it before the connection dropped: reuse that pull request
+      const dup = /already exists[\s\S]*?(https:\/\/github\.com\/\S+\/pull\/\d+)/i.exec(String(err.stderr || err.message));
+      if (dup) return dup[1];
+      throw err;
+    }
   } finally {
     fs.rmSync(work, { recursive: true, force: true });
   }
@@ -196,18 +253,22 @@ export async function cmdSubmit(args, { exec = defaultExec, verifyRemote = skill
     say(t('submitManual', { upstream: UPSTREAM, dir: pkgDir, path: pkg.path.join('/') }));
     return { pkgDir, pkg };
   }
-  try {
-    const url = openPullRequest({ pkgDir, pkg, gh, exec });
-    say(`\n${t('submitPrOpened', { url })}`);
-    say(t('submitNext'));
-    // the CLA link and the wait for the merge, with enter to continue (under test fakes there is nothing to wait for)
-    if (hasTerminal() && exec === defaultExec) await watchPullRequest(url, { pick: choose, out: say });
-    return { pkgDir, pkg, url };
-  } catch (err) {
-    say(`\n${t('submitGhFail', { msg: String(err.stderr || err.message).trim().split(/\r?\n/).slice(-3).join(' ') })}`);
-    say(t('submitManual', { upstream: UPSTREAM, dir: pkgDir, path: pkg.path.join('/') }));
-    process.exitCode = 1;
-    return { pkgDir, pkg };
+  for (;;) {
+    try {
+      const url = openPullRequest({ pkgDir, pkg, gh, exec });
+      say(`\n${t('submitPrOpened', { url })}`);
+      say(t('submitNext'));
+      // the CLA link and the wait for the merge, with enter to continue (under test fakes there is nothing to wait for)
+      if (hasTerminal() && exec === defaultExec) await watchPullRequest(url, { pick: choose, out: say });
+      return { pkgDir, pkg, url };
+    } catch (err) {
+      say(`\n${t('submitGhFail', { msg: String(err.stderr || err.message).trim().split(/\r?\n/).slice(-3).join(' ') })}`);
+      // Enter retries: a non-technical contributor should not have to start over after a GitHub hiccup.
+      if (!opts.yes && isTransient(err) && hasTerminal() && await confirm(t('submitRetry'), true)) continue;
+      say(t('submitManual', { upstream: UPSTREAM, dir: pkgDir, path: pkg.path.join('/') }));
+      process.exitCode = 1;
+      return { pkgDir, pkg };
+    }
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skillgauntlet",
-  "version": "1.3.7",
+  "version": "1.3.9",
   "description": "Check an agent skill before you install it: context cost, permission surface, code risk, instruction hijacking, description quality, trigger rate and gain.",
   "type": "module",
   "bin": {