opencode-magi 0.0.0-dev-20260725061658 → 0.0.0-dev-20260725143609

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.
@@ -20,12 +20,12 @@ function requiredErrors(config, { creator = false, editor = false, github = true
20
20
  required(github, config.github.owner, "github.owner"),
21
21
  required(github, config.github.repo, "github.repo"),
22
22
  required(reviewers, config.review.reviewers, "review.reviewers"),
23
- ...(config.review.reviewers ?? []).map((reviewer, index) => required(reviewers || !!reviewer, reviewer.model, `review.reviewers[${index}].model`)),
23
+ ...(config.review.reviewers ?? []).map((reviewer, index) => required(reviewers, reviewer.model, `review.reviewers[${index}].model`)),
24
24
  required(editor, config.merge.editor, "merge.editor"),
25
25
  required(editor, config.merge.editor?.model, "merge.editor.model"),
26
26
  required(editor, config.merge.editor?.author, "merge.editor.author"),
27
27
  required(voters, config.triage.voters, "triage.voters"),
28
- ...(config.triage.voters ?? []).map((voter, index) => required(voters || !!voter, voter.model, `triage.voters[${index}].model`)),
28
+ ...(config.triage.voters ?? []).map((voter, index) => required(voters, voter.model, `triage.voters[${index}].model`)),
29
29
  required(creator, config.triage.creator, "triage.creator"),
30
30
  required(creator, config.triage.creator?.model, "triage.creator.model"),
31
31
  required(creator, config.triage.creator?.author, "triage.creator.author"),
@@ -233,10 +233,24 @@ export async function automate() {
233
233
  const octokit = await this.magi.createOctokit(this.config, this.context.abort, account);
234
234
  const graphql = this.magi.createGraphql(octokit);
235
235
  const enqueuedAt = new Date().toISOString();
236
- await ignoreError(() => graphql.enqueuePullRequest({ id: this.state.pr.metadata.node_id }), (e) => {
236
+ try {
237
+ await ignoreError(() => graphql.enqueuePullRequest({ id: this.state.pr.metadata.node_id }), (e) => {
238
+ const message = e instanceof Error ? e.message : String(e);
239
+ return /pull request is already in the queue/i.test(message);
240
+ });
241
+ }
242
+ catch (e) {
237
243
  const message = e instanceof Error ? e.message : String(e);
238
- return /pull request is already in the queue/i.test(message);
239
- });
244
+ if (!/pull request is closed/i.test(message))
245
+ throw e;
246
+ const { repository } = await graphql.mergeQueueStatus({
247
+ owner: this.config.github.owner,
248
+ pr: this.number,
249
+ repo: this.config.github.repo,
250
+ });
251
+ if (repository?.pullRequest?.state !== "MERGED")
252
+ throw e;
253
+ }
240
254
  await this.updateEvent(`Waiting for merge queue.`);
241
255
  const result = await waitMergeQueue.call(this, enqueuedAt);
242
256
  if (result === "CONFLICT")
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "opencode-magi",
3
- "version": "0.0.0-dev-20260725061658",
3
+ "version": "0.0.0-dev-20260725143609",
4
4
  "description": "Multi-agent PR review and merge orchestration plugin for OpenCode.",
5
5
  "license": "MIT",
6
6
  "author": "Hirotomo Yamada <hirotomo.yamada@avap.co.jp>",