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.

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