@@ -0,0 +55,4 @@
+      source: inputs.sourceBranch,
+      target: inputs.targetBranch,
+      commitMessages,
+      diffStat,

@@ -0,0 +81,4 @@
+  log.warn(`偵測到衝突檔案 (${files.length}): ${files.join(', ')}`);
+  const resolveBranch = buildResolveBranchName(inputs.targetBranch, inputs.sourceBranch);
+
+  log.step('建立解衝突分支並合併來源分支');

@@ -0,0 +147,4 @@
+}
+
+/** 解衝突 PR 的描述。 */
+function buildResolveBody({ source, target, resolveBranch, files, summary }) {

@@ -0,0 +177,4 @@
+  } else {
+    log.info(`PR 已存在 #${number}: ${url}`);
+  }
+}

@@ -0,0 +49,4 @@
+   *
+   * @param {string[]} branches
+   */
+  fetchBranches(branches) {

@@ -0,0 +60,4 @@
+    const result = this._git(['rev-list', '--count', `refs/remotes/pr/${target}..refs/remotes/pr/${source}`]);
+    return result.status === 0 ? parseInt(result.stdout.trim(), 10) || 0 : 0;
+  }
+

@@ -0,0 +92,4 @@
+  }
+
+  /**
+   * 偵測 source 合併進 target 是否會衝突（不會留下任何變更）。

@@ -0,0 +104,4 @@
+    const merge = this._git(['merge', '--no-commit', '--no-ff', `refs/remotes/pr/${source}`]);
+    let hasConflict = merge.status !== 0;
+    let files = [];
+

@@ -0,0 +151,4 @@
+      runOrThrow(
+        'git',
+        ['commit', '--no-verify', '-m', `Merge branch '${source}' into ${resolveBranch}（含衝突標記，待人工解衝突）`],
+        { cwd: this.cwd },

@@ -0,0 +25,4 @@
+      headers: {
+        Authorization: `token ${this.token}`,
+        'Content-Type': 'application/json',
+        Accept: 'application/json',

@@ -0,0 +49,4 @@
+   */
+  async findOpenPull(head, base) {
+    // Gitea pulls 不直接支援 head/base 過濾，這裡撈開啟中的 PR 自行比對
+    const { ok, json } = await this._request(

@@ -0,0 +31,4 @@
+   *
+   * @returns {string} config 檔路徑
+   */
+  _writeConfig() {

@@ -0,0 +103,4 @@
+    return parsed;
+  }
+}
+

@@ -0,0 +173,4 @@
+      if (escape) {
+        out += ch;
+        escape = false;
+        continue;

@@ -0,0 +11,4 @@
+export function run(command, args = [], options = {}) {
+  const result = spawnSync(command, args, {
+    encoding: 'utf8',
+    maxBuffer: 64 * 1024 * 1024, // 64MB，避免大型 diff 被截斷

@@ -0,0 +4,4 @@
+import { OpenCode } from './lib/opencode.js';
+import { log, maskSecrets } from './lib/util.js';
+
+async function main() {

@@ -0,0 +34,4 @@
+
+  // 3. 蒐集 diff 內容
+  log.step('蒐集 git diff');
+  const commitMessages = git.getCommitMessages(inputs.targetBranch, inputs.sourceBranch);

@@ -0,0 +147,4 @@
+  const stem = `${safe(target)}-into-${safe(source)}`.slice(0, 180);
+  return `resolve-conflict/${stem}${suffix}`;
+}
+

@@ -0,0 +180,4 @@
+    log.info(`PR 已存在 #${number}: ${url}`);
+  }
+}
+

@@ -0,0 +103,4 @@
+
+    const merge = this._git(['merge', '--no-commit', '--no-ff', `refs/remotes/pr/${source}`]);
+    let hasConflict = merge.status !== 0;
+    let files = [];

@@ -0,0 +74,4 @@
+    const configPath = this._writeConfig();
+    const prompt = buildPrompt({ ...ctx, language: this.language });
+
+    try {

@@ -0,0 +173,4 @@
+  let inString = false;
+  let escape = false;
+  for (let i = 0; i < text.length; i++) {
+    const ch = text[i];

@@ -2,1 +13,4 @@
+
+# 應用程式無第三方相依套件，僅在有 package-lock 時安裝
+RUN if [ -f /app/package-lock.json ]; then cd /app && npm ci --omit=dev; fi
 

@@ -0,0 +74,4 @@
+      body: summary.description,
+    });
+    reportPull(pull, created);
+    return;

@@ -0,0 +103,4 @@
+
+    const merge = this._git(['merge', '--no-commit', '--no-ff', `refs/remotes/pr/${source}`]);
+    let hasConflict = merge.status !== 0;
+    let files = [];

@@ -0,0 +119,4 @@
+  }
+
+  /**
+   * 建立解衝突分支：以 target 為基礎，合併 source（保留衝突標記後 commit），

@@ -0,0 +142,4 @@
+
+    let files = [];
+    if (merge.status !== 0) {
+      // 合併產生衝突：將含有衝突標記的檔案標記為已解決後 commit，

@@ -0,0 +37,4 @@
+
+    const config = {
+      $schema: 'https://opencode.ai/config.json',
+      provider: {

@@ -0,0 +74,4 @@
+    const configPath = this._writeConfig();
+    const prompt = buildPrompt({ ...ctx, language: this.language });
+
+    try {

@@ -0,0 +124,4 @@
+    `=== Commits ===`,
+    commitMessages || '(no commit messages)',
+    ``,
+    `=== Changed files (stat) ===`,

@@ -0,0 +151,4 @@
+  for (const candidate of findJsonObjects(text)) {
+    // LLM 常在字串值內輸出未跳脫的換行，先嘗試原始解析，失敗再嘗試修正
+    for (const variant of [candidate, escapeControlCharsInStrings(candidate)]) {
+      try {

@@ -0,0 +177,4 @@
+    if (inString) {
+      if (escape) {
+        out += ch;
+        escape = false;