chore: merge upstream opencode v1.2.26

.github/actions/setup-bun/action.yml

@@ -3,14 +3,6 @@ description: "Setup Bun with caching and install dependencies"
 runs:
   using: "composite"
   steps:
-    - name: Cache Bun dependencies
-      uses: actions/cache@v4
-      with:
-        path: ~/.bun/install/cache
-        key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lockb') }}
-        restore-keys: |
-          ${{ runner.os }}-bun-
-
     - name: Get baseline download URL
       id: bun-url
       shell: bash
@@ -31,6 +23,23 @@ runs:
         bun-version-file: ${{ !steps.bun-url.outputs.url && 'package.json' || '' }}
         bun-download-url: ${{ steps.bun-url.outputs.url }}
 
+    - name: Get cache directory
+      id: cache
+      shell: bash
+      run: echo "dir=$(bun pm cache)" >> "$GITHUB_OUTPUT"
+
+    - name: Cache Bun dependencies
+      uses: actions/cache@v4
+      with:
+        path: ${{ steps.cache.outputs.dir }}
+        key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-bun-
+
+    - name: Install setuptools for distutils compatibility
+      run: python3 -m pip install setuptools || pip install setuptools || true
+      shell: bash
+
     - name: Install dependencies
       run: bun install
       shell: bash

.github/workflows/beta.yml

@@ -1,9 +1,11 @@
 name: beta
 
+# Disabled — upstream beta branch syncing workflow, not needed for our fork.
+# To re-enable, uncomment the triggers below.
 on:
   workflow_dispatch:
-  schedule:
-    - cron: "0 * * * *"
+  # schedule:
+  #   - cron: "0 * * * *"
 
 jobs:
   sync:

.github/workflows/ci.yml

@@ -42,6 +42,39 @@ jobs:
         run: bun test
         working-directory: packages/opencode
 
+  marker-guard:
+    name: Marker Guard
+    runs-on: ubuntu-latest
+    if: github.event_name == 'pull_request'
+    timeout-minutes: 5
+    steps:
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+        with:
+          fetch-depth: 0
+
+      - uses: oven-sh/setup-bun@ecf28ddc73e819eb6fa29df6b34ef8921c743461 # v2
+        with:
+          bun-version: "1.3.10"
+
+      - name: Add upstream remote
+        run: |
+          git remote add upstream https://github.com/anomalyco/opencode.git || true
+          git fetch upstream --quiet
+
+      - name: Install merge tooling deps
+        run: bun install
+        working-directory: script/upstream
+
+      - name: Check for missing altimate_change markers
+        run: |
+          # Skip strict marker enforcement for upstream merge PRs — all changes come from upstream
+          if [[ "${{ github.head_ref }}" == merge-upstream-* ]] || [[ "${{ github.head_ref }}" == upstream/merge-* ]]; then
+            echo "Upstream merge PR detected — running marker check in non-strict mode"
+            bun run script/upstream/analyze.ts --markers --base ${{ github.event.pull_request.base.ref }}
+          else
+            bun run script/upstream/analyze.ts --markers --base ${{ github.event.pull_request.base.ref }} --strict
+          fi
+
   lint:
     name: Lint
     runs-on: ubuntu-latest

.github/workflows/opencode.yml

@@ -9,10 +9,10 @@ on:
 jobs:
   altimate-code:
     if: |
-      contains(github.event.comment.body, ' /oc') ||
-      startsWith(github.event.comment.body, '/oc') ||
-      contains(github.event.comment.body, ' /opencode') ||
-      startsWith(github.event.comment.body, '/opencode')
+      contains(github.event.comment.body, ' /altimate') ||
+      startsWith(github.event.comment.body, '/altimate') ||
+      contains(github.event.comment.body, ' /ac') ||
+      startsWith(github.event.comment.body, '/ac')
     runs-on: blacksmith-4vcpu-ubuntu-2404
     permissions:
       id-token: write
@@ -31,4 +31,4 @@ jobs:
           OPENCODE_API_KEY: ${{ secrets.OPENCODE_API_KEY }}
           OPENCODE_PERMISSION: '{"bash": "deny"}'
         with:
-          model: opencode/claude-opus-4-5
+          model: anthropic/claude-opus-4-5

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 node_modules
+__pycache__
 .worktrees
 .sst
 .env
@@ -17,7 +18,7 @@ ts-dist
 /result
 refs
 Session.vim
-opencode.json
+/opencode.json
 a.out
 target
 .scripts

.opencode/.gitignore

@@ -1,3 +1,4 @@
 plans/
 bun.lock
 package.json
+package-lock.json