fitzgibbon/opencode-anarchy - Change OIILX7N5FU73FKQ2OGAH3WHCQWNAC4JZBQE3AUX5EQIV2Z7LSQUAC

Use trunk-only forks with parent remote

Created by G8qzBDPkyFWiTEg4ytm8NUw2bhYLjE9mvCJek2frJAVK on January 29, 2026

OIILX7N5FU73FKQ2OGAH3WHCQWNAC4JZBQE3AUX5EQIV2Z7LSQUAC

Dependencies

In channels

main

Change contents

Insertion in test-suite/src/index.ts at line 5 [3.2512]
[3.2671]
[3.2671]
```
import os from 'os';
```
Replacement in test-suite/src/index.ts at line 25 [3.2512]
B:BD[3.3021] → [3.3021:3040]
```
  channel: string;
```
[3.3021]
[3.3040]
```
  channel?: string;
```

Insertion in test-suite/src/index.ts at line 199 [3.2512]

[3.7624]

async function ensureDefaultRemote(repoPath: string, remote: string): Promise<void> {
  const configPath = path.join(repoPath, '.pijul', 'config');
  let config = '';
  if (await pathExists(configPath)) {
    config = await fs.readFile(configPath, 'utf8');
  }
  const entry = `default_remote = "${remote}"`;
  if (config.trim().length === 0) {
    await fs.writeFile(configPath, `${entry}\n`, 'utf8');
    return;
  }
  if (config.match(/^default_remote\s*=.*$/m)) {
    const updated = config.replace(/^default_remote\s*=.*$/m, entry);
    await fs.writeFile(configPath, updated, 'utf8');
    return;
  }
  const suffix = config.endsWith('\n') ? '' : '\n';
  await fs.writeFile(configPath, `${config}${suffix}${entry}\n`, 'utf8');
}

Replacement in test-suite/src/index.ts at line 220 [3.2512]

B:BD[3.7685] → [3.7685:7796]

  return `${feature.feature} (${feature.status}) - channel=${feature.channel} workspace=${feature.workspace}`;

[3.7685]

[3.7796]

  return `${feature.feature} (${feature.status}) - workspace=${feature.workspace}`;

Replacement in test-suite/src/index.ts at line 270 [3.2512]

B:BD[3.9298] → [3.9298:9371]

        if (features.length === 0) return 'No active feature channels.';

[3.9298]

[3.9371]

        if (features.length === 0) return 'No active feature workspaces.';

Deletion in test-suite/src/index.ts at line 288 [3.2512]

B:BD[3.10025] → [3.10025:10132]

        const channel = `feature/${featureKey}`;
        const stateDir = path.join(root, STATE_DIR_NAME);

Replacement in test-suite/src/index.ts at line 290 [3.2512]

B:BD[3.10226] → [3.10226:10273]

          : path.join(stateDir, 'workspaces');

[3.10226]

[3.10273]

          : path.join(os.tmpdir(), 'opencode-pijul-workspaces');

Insertion in test-suite/src/index.ts at line 296 [3.2512]
[3.10422]
[3.10422]
```
          await ensureDefaultRemote(workspace, root);
```
Deletion in test-suite/src/index.ts at line 299 [3.2512]
B:BD[3.10496] → [3.10496:10517]
```
            channel,
```

Deletion in test-suite/src/index.ts at line 312 [3.2512]

B:BD[3.11094] → [3.11094:11801]

        }
        const channelResult = await runCommand('pijul', ['channel', 'new', channel, '--no-prompt'], workspace);
        if (channelResult.exitCode !== 0) {
          const combined = `${channelResult.stdout}\n${channelResult.stderr}`.toLowerCase();
          if (!combined.includes('already') && !combined.includes('exists')) {
            return `Failed to create channel: ${channelResult.stderr || channelResult.stdout}`;
          }
        }
        const switchResult = await runCommand('pijul', ['channel', 'switch', channel, '--no-prompt'], workspace);
        if (switchResult.exitCode !== 0) {
          return `Failed to switch channel: ${switchResult.stderr || switchResult.stdout}`;

Insertion in test-suite/src/index.ts at line 313 [3.2512]
[3.11811]
[3.11811]
```
        await ensureDefaultRemote(workspace, root);
```
Deletion in test-suite/src/index.ts at line 317 [3.2512]
B:BD[3.11882] → [3.11882:11901]
```
          channel,
```

Replacement in test-suite/src/index.ts at line 322 [3.2512]

B:BD[3.12029] → [3.12029:12100]

        return `Spawned ${featureKey} in ${workspace} on ${channel}.`;

[3.12029]

[3.12100]

        return `Spawned ${featureKey} in ${workspace} on trunk.`;

Insertion in test-suite/src/index.ts at line 330 [3.2512]
[3.12366]
[3.12366]
```
        await ensureDefaultRemote(feature.workspace, root);
```

Replacement in test-suite/src/index.ts at line 335 [3.2512]

B:BD[3.12431] → [3.12431:12516]

          ['pull', root, '--from-channel', state.trunkChannel, '-a', '--no-prompt'],

[3.12431]

[3.12516]

          ['pull', '--from-channel', state.trunkChannel, '-a', '--no-prompt'],

Insertion in test-suite/src/index.ts at line 359 [3.2512]
[3.13395]
[3.13395]
```
        await ensureDefaultRemote(feature.workspace, root);
```

Deletion in test-suite/src/index.ts at line 392 [3.2512]

B:BD[3.14459] → [3.14459:14796]

        const syncResult = await runCommand(
          'pijul',
          ['pull', root, '--from-channel', state.trunkChannel, '-a', '--no-prompt'],
          feature.workspace,
        );
        if (syncResult.exitCode !== 0) {
          return `Failed to sync trunk before push: ${syncResult.stderr || syncResult.stdout}`;
        }

Deletion in test-suite/src/index.ts at line 402 [3.2512]

B:BD[3.15253] → [3.15253:15525]

        }
        const switchResult = await runCommand('pijul', ['channel', 'switch', state.trunkChannel, '--no-prompt'], root);
        if (switchResult.exitCode !== 0) {
          return `Failed to switch trunk channel: ${switchResult.stderr || switchResult.stdout}`;

Replacement in test-suite/src/index.ts at line 404 [3.2512]
B:BD[3.15536] → [3.15536:15581]
```
        const pullResult = await runCommand(
```
[3.15536]
[3.15581]
```
        const pushResult = await runCommand(
```

Replacement in test-suite/src/index.ts at line 406 [3.2512]

B:BD[3.15600] → [3.15600:15711]

          ['pull', feature.workspace, '--from-channel', feature.channel, '-a', '--no-prompt'],
          root,

[3.15600]

[3.15711]

          ['push', '--to-channel', state.trunkChannel, '-a', '--no-prompt'],
          feature.workspace,

Replacement in test-suite/src/index.ts at line 409 [3.2512]

B:BD[3.15722] → [3.15722:16539]

        if (pullResult.exitCode !== 0) {
          return `Failed to pull feature changes into trunk: ${pullResult.stderr || pullResult.stdout}`;
        }
        const trunkAfterPullClean = await pijulDiffIsClean(root);
        if (!trunkAfterPullClean) {
          feature.status = 'blocked';
          await writeState(root, state);
          return 'Trunk has unresolved changes after pull; resolve conflicts in trunk then retry push.';
        }
        if (state.remote) {
          const pushResult = await runCommand(
            'pijul',
            ['push', state.remote, '--from-channel', state.trunkChannel, '-a', '--no-prompt'],
            root,
          );
          if (pushResult.exitCode !== 0) {
            return `Failed to push trunk: ${pushResult.stderr || pushResult.stdout}`;
          }

[3.15722]

[3.16539]

        if (pushResult.exitCode !== 0) {
          return `Failed to push trunk: ${pushResult.stderr || pushResult.stdout}`;

Replacement in test-suite/src/command/pijul-sync.md at line 5 [3.17351]

B:BD[3.17411] → [3.17411:17490]

You are a feature sub-agent. Sync your workspace with trunk before proceeding.

[3.17411]

[3.17490]

You are a feature sub-agent. Sync your workspace with trunk from the `parent` remote (default remote points to the parent repo) before proceeding.

Replacement in test-suite/src/command/pijul-status.md at line 2 [3.17698]
B:BD[3.17703] → [3.17703:17756]
```
description: Show all active Pijul feature channels.
```
[3.17703]
[3.17756]
```
description: Show all active Pijul feature workspaces.
```

Replacement in test-suite/src/command/pijul-spawn.md at line 2 [3.17899]

B:BD[3.17904] → [3.17904:17973]

description: Create a feature channel and workspace for a sub-agent.

[3.17904]

[3.17973]

description: Create a feature workspace for a sub-agent.

Replacement in test-suite/src/command/pijul-spawn.md at line 5 [3.17899]

B:BD[3.17978] → [3.17978:18075]

You are the coordinator. Create a Pijul feature workspace and channel for the requested feature.

[3.17978]

[2.945]

You are the coordinator. Create a Pijul feature workspace for the requested feature.

Replacement in test-suite/src/command/pijul-spawn.md at line 10 [3.17899]
B:BD[3.18151] → [3.18151:18206]
```
2. Share the workspace path and channel with the user.
```
[3.18151]
[3.18206]
```
2. Share the workspace path with the user.
```

Insertion in test-suite/src/command/pijul-spawn.md at line 14 [3.17899]

[3.18389]

   - The rule: record must always be non-interactive (use `-a`, a message, and `--no-prompt`); never open an editor.
   - The rule: push must always be non-interactive (use `-a` and `--no-prompt`).
   - The rule: all work stays on trunk in the forked workspace; use the `parent` remote (default remote points to the parent repo) for sync/push.

Insertion in test-suite/src/command/pijul-record.md at line 6 [3.18493]

[3.18622]


CRITICAL: Never allow an editor to open. Always record non-interactively with `-a`, a message, and `--no-prompt`.

Replacement in test-suite/src/command/pijul-push.md at line 2 [3.18781]
B:BD[3.18786] → [3.18786:18834]
```
description: Push a feature channel into trunk.
```
[3.18786]
[3.18834]
```
description: Push a feature workspace into trunk.
```

Replacement in test-suite/src/command/pijul-push.md at line 5 [3.18781]

B:BD[3.18839] → [3.18839:18918]

You are a feature sub-agent. Push your ready feature into trunk after syncing.

[3.18839]

[3.18918]

You are a feature sub-agent. Push your ready feature into trunk on the `parent` remote (default remote points to the parent repo) after syncing.

Insertion in test-suite/src/command/pijul-push.md at line 7 [3.18781]

[3.18919]

CRITICAL: Never allow an editor to open. Always push non-interactively with `-a` and `--no-prompt`.

Replacement in test-suite/src/command/pijul-direct.md at line 12 [3.19357]

B:BD[3.19601] → [3.19601:19690]

Remind the sub-agent to sync with trunk before pushing and to resolve conflicts locally.

[3.19601]

Remind the sub-agent to sync with trunk from the `parent` remote (default remote points to the parent repo) before pushing and to resolve conflicts locally.

Insertion in src/index.ts at line 5 [4.2488]
[4.2647]
[4.2647]
```
import os from 'os';
```
Replacement in src/index.ts at line 25 [4.2488]
B:BD[4.2997] → [4.2997:3016]
```
  channel: string;
```
[4.2997]
[4.3016]
```
  channel?: string;
```

Insertion in src/index.ts at line 228 [4.2488]

[4.7600]

async function ensureDefaultRemote(repoPath: string, remote: string): Promise<void> {
  const configPath = path.join(repoPath, '.pijul', 'config');
  let config = '';
  if (await pathExists(configPath)) {
    config = await fs.readFile(configPath, 'utf8');
  }
  const entry = `default_remote = "${remote}"`;
  if (config.trim().length === 0) {
    await fs.writeFile(configPath, `${entry}\n`, 'utf8');
    return;
  }
  if (config.match(/^default_remote\s*=.*$/m)) {
    const updated = config.replace(/^default_remote\s*=.*$/m, entry);
    await fs.writeFile(configPath, updated, 'utf8');
    return;
  }
  const suffix = config.endsWith('\n') ? '' : '\n';
  await fs.writeFile(configPath, `${config}${suffix}${entry}\n`, 'utf8');
}

Replacement in src/index.ts at line 251 [4.2488]

B:BD[3.26253] → [3.26253:26394]

  return `${feature.feature} (${feature.status}) depth=${depth} parent=${parent} channel=${feature.channel} workspace=${feature.workspace}`;

[3.26253]

[4.7772]

  return `${feature.feature} (${feature.status}) depth=${depth} parent=${parent} workspace=${feature.workspace}`;

Replacement in src/index.ts at line 306 [4.2488]

B:BD[4.9274] → [4.9274:9347]

        if (features.length === 0) return 'No active feature channels.';

[4.9274]

[4.9347]

        if (features.length === 0) return 'No active feature workspaces.';

Deletion in src/index.ts at line 347 [4.2488]

∅:D[3.27812] → [4.10001:10108]

B:BD[4.10001] → [4.10001:10108]

        const channel = `feature/${featureKey}`;
        const stateDir = path.join(root, STATE_DIR_NAME);

Replacement in src/index.ts at line 349 [4.2488]

B:BD[4.10202] → [4.10202:10249]

          : path.join(stateDir, 'workspaces');

[4.10202]

[4.10249]

          : path.join(os.tmpdir(), 'opencode-pijul-workspaces');

Insertion in src/index.ts at line 356 [4.2488]

[3.27868]

[4.10398]

          await ensureDefaultRemote(workspace, root);

Deletion in src/index.ts at line 359 [4.2488]
B:BD[4.10472] → [4.10472:10493]
```
            channel,
```
Insertion in src/index.ts at line 386 [4.2488]
[4.11080]
[4.11080]
```
        await ensureDefaultRemote(workspace, root);
```

Deletion in src/index.ts at line 388 [4.2488]

B:BD[4.11081] → [4.11081:11788]

        const channelResult = await runCommand('pijul', ['channel', 'new', channel, '--no-prompt'], workspace);
        if (channelResult.exitCode !== 0) {
          const combined = `${channelResult.stdout}\n${channelResult.stderr}`.toLowerCase();
          if (!combined.includes('already') && !combined.includes('exists')) {
            return `Failed to create channel: ${channelResult.stderr || channelResult.stdout}`;
          }
        }
        const switchResult = await runCommand('pijul', ['channel', 'switch', channel, '--no-prompt'], workspace);
        if (switchResult.exitCode !== 0) {
          return `Failed to switch channel: ${switchResult.stderr || switchResult.stdout}`;
        }

Deletion in src/index.ts at line 390 [4.2488]
B:BD[4.11858] → [4.11858:11877]
```
          channel,
```

Replacement in src/index.ts at line 407 [4.2488]

B:BD[4.12005] → [4.12005:12076]

        return `Spawned ${featureKey} in ${workspace} on ${channel}.`;

[4.12005]

[4.12076]

        return `Spawned ${featureKey} in ${workspace} on trunk.`;

Insertion in src/index.ts at line 415 [4.2488]

[4.12342]


        await ensureDefaultRemote(feature.workspace, root);

Replacement in src/index.ts at line 420 [4.2488]

B:BD[4.12407] → [4.12407:12492]

          ['pull', root, '--from-channel', state.trunkChannel, '-a', '--no-prompt'],

[4.12407]

[4.12492]

          ['pull', '--from-channel', state.trunkChannel, '-a', '--no-prompt'],

Insertion in src/index.ts at line 444 [4.2488]

[4.13371]


        await ensureDefaultRemote(feature.workspace, root);

Deletion in src/index.ts at line 498 [4.2488]

B:BD[4.15229] → [4.15229:16515]

        }
        const switchResult = await runCommand('pijul', ['channel', 'switch', state.trunkChannel, '--no-prompt'], root);
        if (switchResult.exitCode !== 0) {
          return `Failed to switch trunk channel: ${switchResult.stderr || switchResult.stdout}`;
        }
        const pullResult = await runCommand(
          'pijul',
          ['pull', feature.workspace, '--from-channel', feature.channel, '-a', '--no-prompt'],
          root,
        );
        if (pullResult.exitCode !== 0) {
          return `Failed to pull feature changes into trunk: ${pullResult.stderr || pullResult.stdout}`;
        }
        const trunkAfterPullClean = await pijulDiffIsClean(root);
        if (!trunkAfterPullClean) {
          feature.status = 'blocked';
          await writeState(root, state);
          return 'Trunk has unresolved changes after pull; resolve conflicts in trunk then retry push.';
        }
        if (state.remote) {
          const pushResult = await runCommand(
            'pijul',
            ['push', state.remote, '--from-channel', state.trunkChannel, '-a', '--no-prompt'],
            root,
          );
          if (pushResult.exitCode !== 0) {
            return `Failed to push trunk: ${pushResult.stderr || pushResult.stdout}`;
          }

Replacement in src/index.ts at line 500 [4.2488]

B:BD[4.16526] → [3.29388:29442]

        const featureSwitchResult = await runCommand(

[4.16526]

[3.29442]

        const pushResult = await runCommand(

Replacement in src/index.ts at line 502 [4.2488]

B:BD[3.29461] → [3.29461:29529]

          ['channel', 'switch', state.trunkChannel, '--no-prompt'],

[3.29461]

[3.29529]

          ['push', '--to-channel', state.trunkChannel, '-a', '--no-prompt'],

Replacement in src/index.ts at line 505 [4.2488]

B:BD[3.29569] → [3.29569:29744]

        if (featureSwitchResult.exitCode !== 0) {
          return `Failed to switch feature workspace to trunk: ${featureSwitchResult.stderr || featureSwitchResult.stdout}`;

[3.29569]

[3.29744]

        if (pushResult.exitCode !== 0) {
          return `Failed to push trunk: ${pushResult.stderr || pushResult.stdout}`;

Deletion in src/index.ts at line 509 [4.2488]

B:BD[3.29755] → [3.29755:30234]

        const deleteResult = await runCommand(
          'pijul',
          ['channel', 'delete', feature.channel, '--no-prompt'],
          feature.workspace,
        );
        if (deleteResult.exitCode !== 0) {
          const combined = `${deleteResult.stdout}\n${deleteResult.stderr}`.toLowerCase();
          if (!combined.includes('not found')) {
            return `Failed to delete feature channel: ${deleteResult.stderr || deleteResult.stdout}`;
          }
        }

Replacement in src/command/pijul-sync.md at line 5 [4.17327]

B:BD[4.17387] → [4.17387:17466]

You are a feature sub-agent. Sync your workspace with trunk before proceeding.

[4.17387]

[4.17466]

You are a feature sub-agent. Sync your workspace with trunk from the `parent` remote (default remote points to the parent repo) before proceeding.

Replacement in src/command/pijul-status.md at line 2 [4.17674]
B:BD[4.17679] → [4.17679:17732]
```
description: Show all active Pijul feature channels.
```
[4.17679]
[4.17732]
```
description: Show all active Pijul feature workspaces.
```

Replacement in src/command/pijul-spawn.md at line 2 [4.17875]

B:BD[4.17880] → [4.17880:17949]

description: Create a feature channel and workspace for a sub-agent.

[4.17880]

[4.17949]

description: Create a feature workspace for a sub-agent.

Replacement in src/command/pijul-spawn.md at line 5 [4.17875]

B:BD[4.17954] → [4.17954:18051]

You are the coordinator. Create a Pijul feature workspace and channel for the requested feature.

[4.17954]

[5.39]

You are the coordinator. Create a Pijul feature workspace for the requested feature.

Replacement in src/command/pijul-spawn.md at line 18 [4.17875]
∅:D[3.30845] → [4.18127:18182]
B:BD[4.18127] → [4.18127:18182]
```
2. Share the workspace path and channel with the user.
```
[3.30845]
[4.18182]
```
2. Share the workspace path with the user.
```

Replacement in src/command/pijul-spawn.md at line 21 [4.17875]

B:BD[4.18301] → [3.30846:30974]

   - The workflow: sync → resolve conflicts → record → push → verify trunk clean → delete channel → report summary.

[4.18301]

[3.30974]

   - The workflow: sync → resolve conflicts → record → push → verify trunk clean → report summary.
   - The rule: all work stays on trunk in the forked workspace; use the `parent` remote (default remote points to the parent repo) for sync/push.
   - The rule: record must always be non-interactive (use `-a`, a message, and `--no-prompt`); never open an editor.
   - The rule: push must always be non-interactive (use `-a` and `--no-prompt`).

Insertion in src/command/pijul-record.md at line 6 [4.18469]

[3.31216]

[4.18598]


CRITICAL: Never allow an editor to open. Always record non-interactively with `-a`, a message, and `--no-prompt`.

Replacement in src/command/pijul-push.md at line 2 [4.18757]
B:BD[4.18762] → [4.18762:18810]
```
description: Push a feature channel into trunk.
```
[4.18762]
[4.18810]
```
description: Push a feature workspace into trunk.
```

Replacement in src/command/pijul-push.md at line 5 [4.18757]

B:BD[4.18815] → [3.31308:31401]

You are a feature sub-agent. Push your ready feature into trunk after syncing and recording.

[4.18815]

[4.18894]

You are a feature sub-agent. Push your ready feature into trunk on the `parent` remote (default remote points to the parent repo) after syncing and recording.
CRITICAL: Never allow an editor to open. Always push non-interactively with `-a` and `--no-prompt`.

Replacement in src/command/pijul-push.md at line 14 [4.18757]

B:BD[4.19053] → [3.31402:31518]

After a successful push, confirm the feature channel is deleted and report a human-readable summary to your parent.

[4.19053]

[3.31518]

After a successful push, report a human-readable summary to your parent.

Replacement in src/command/pijul-direct.md at line 12 [4.19333]

B:BD[4.19577] → [3.31609:31756]

Remind the sub-agent of the workflow: sync → resolve conflicts → record → push → verify trunk clean → delete channel → report summary.

[4.19577]

[3.31756]

Remind the sub-agent of the workflow: sync → resolve conflicts → record → push → verify trunk clean → report summary.