Skip to content

Prime upstream sync blocked #44

Description

@github-actions

Prime upstream 74c8d39ee16a94cc85fe6f388c2976e8d2593616 conflicts with Pylon 63fb578aace412da02c999e383b7dde8c9a84f3a.

Conflicted files: packages/coding-agent/src/main.ts, packages/coding-agent/src/modes/agent-connection/daemon-agent-connection.ts, packages/coding-agent/src/modes/daemon/daemon-client.ts, packages/coding-agent/src/modes/daemon/daemon-mode.ts, packages/coding-agent/src/modes/daemon/daemon-protocol.ts, packages/coding-agent/src/modes/daemon/daemon-supervisor.ts, packages/coding-agent/src/modes/daemon/daemon-worker-client.ts, packages/coding-agent/test/daemon-protocol.test.ts, packages/coding-agent/test/daemon-supervisor-admission.test.ts, packages/coding-agent/test/daemon-supervisor-monitor.test.ts, packages/coding-agent/test/daemon-supervisor-process.test.ts

Resolve this on a task branch from pylon. Preserve Pylon behavior, search the overlapping Prime work, and record an adopt, hybridize, retain, or redesign decision in the fork ledger.

Activity

  1. github-actions commented on Sep 11, 2026

    @github-actions
    Author

    GitHub's fork synchronization API could not update main. No direct push was attempted. Inspect the failed workflow run, restore main as an exact Prime mirror if needed, and rerun synchronization.

  2. github-actions commented on Sep 11, 2026

    @github-actions
    Author

    Prime upstream 1eee2938b4eeb7a4d72e17035adda669a89b63de conflicts with Pylon 68603ed89bb597cd715fd6a77bc1c39d7e110298.

    Conflicted files: .github/workflows/build-binaries.yml, .github/workflows/ci.yml, .github/workflows/linear-ticket.yml, packages/ai/package.json, packages/ai/src/providers/openai-completions.ts, packages/ai/src/providers/simple-options.ts, packages/ai/src/types.ts, packages/ai/src/utils/stream-failure.ts, packages/ai/test/anthropic-sse-parsing.test.ts, packages/ai/test/prime-inference-models.test.ts, packages/ai/test/stream-failure.test.ts, packages/coding-agent/docs/settings.md, packages/coding-agent/src/cli/daemon-launch.ts, packages/coding-agent/src/core/agent-session.ts, packages/coding-agent/src/core/compaction/branch-summarization.ts, packages/coding-agent/src/core/compaction/compaction.ts, packages/coding-agent/src/core/refinement/refinement.ts, packages/coding-agent/src/core/sdk.ts, packages/coding-agent/src/core/settings-manager.ts, packages/coding-agent/src/core/side-question.ts, packages/coding-agent/src/core/system-prompt.ts, packages/coding-agent/src/main.ts, packages/coding-agent/src/modes/agent-connection/daemon-agent-connection.ts, packages/coding-agent/src/modes/agent-connection/in-process-agent-connection.ts, packages/coding-agent/src/modes/daemon/command-recovery-journal.ts, packages/coding-agent/src/modes/daemon/daemon-client.ts, packages/coding-agent/src/modes/daemon/daemon-mode.ts, packages/coding-agent/src/modes/daemon/daemon-protocol.ts, packages/coding-agent/src/modes/daemon/daemon-supervisor.ts, packages/coding-agent/src/modes/daemon/daemon-worker-client.ts, packages/coding-agent/src/modes/daemon/daemon-worker-protocol.ts, packages/coding-agent/test/agent-connection-daemon.test.ts, packages/coding-agent/test/agent-session-recursion.test.ts, packages/coding-agent/test/daemon-mode.test.ts, packages/coding-agent/test/daemon-protocol.test.ts, packages/coding-agent/test/daemon-supervisor-admission.test.ts, packages/coding-agent/test/daemon-supervisor-monitor.test.ts, packages/coding-agent/test/daemon-supervisor-process.test.ts, packages/coding-agent/test/suite/agent-session-retry-events.test.ts, packages/coding-agent/test/suite/regressions/4602-snapshot-transfer-idempotency.test.ts, packages/coding-agent/test/system-prompt.test.ts

    Resolve this on a task branch from pylon. Preserve Pylon behavior, search the overlapping Prime work, and record an adopt, hybridize, retain, or redesign decision in the fork ledger.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions