@straiffi/archon 1.2.0 → 1.2.2

package/dist/client/index.html

@@ -5,7 +5,7 @@
     <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Archon</title>
-    <script type="module" crossorigin src="/assets/index-WH13gBCE.js"></script>
+    <script type="module" crossorigin src="/assets/index-BGi8klde.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/rolldown-runtime-BYbx6iT9.js">
     <link rel="modulepreload" crossorigin href="/assets/badge-Bpry9xkS.js">
     <link rel="stylesheet" crossorigin href="/assets/index-Bw66dtZG.css">

package/dist/server/index.js

@@ -1225,7 +1225,11 @@ const getBundleRecentCommitSubjects = (project, bundle) => {
     }
 };
 const serializeBundleDetails = (project, bundle, extras = {}) => {
-    const tickets = bundle ? listDetailedBundleTickets(project.id, bundle.id) : [];
+    const serializedBundle = serializeBundleRow(project.id, bundle);
+    if (!serializedBundle) {
+        throw new Error(`Failed to serialize bundle ${bundle.id}`);
+    }
+    const tickets = listDetailedBundleTickets(project.id, bundle.id);
     const latestSessionTicket = resolveBundleLatestSessionTicket(tickets);
     const resolvedTargetTicket = extras.target_ticket_id
         ? tickets.find(ticket => ticket.id === extras.target_ticket_id) ?? null
@@ -1235,7 +1239,7 @@ const serializeBundleDetails = (project, bundle, extras = {}) => {
         });
     const bundleReviewState = getBundleReviewState(project.id, tickets);
     return {
-        bundle: serializeBundleRow(project.id, bundle),
+        bundle: serializedBundle,
         tickets,
         execution_order_ticket_ids: tickets.map(ticket => ticket.id),
         latest_session_ticket_id: latestSessionTicket?.id ?? null,
@@ -1267,6 +1271,64 @@ const serializeBundleConversationDetails = (project, bundle, extras = {}) => {
         target_ticket_id: resolvedTargetTicket?.id ?? null,
     };
 };
+const getProjectBundleDetails = (projectId, bundleId) => {
+    const project = getProjectById(projectId);
+    if (!project) {
+        return null;
+    }
+    ensureProjectRootBundle(project.id);
+    const bundle = getBundle(bundleId, project.id);
+    if (!bundle) {
+        return null;
+    }
+    return serializeBundleDetails(project, bundle);
+};
+const submitBundleFollowUpResponse = (projectId, bundleId, payload, broadcaster) => {
+    const project = getProjectById(projectId);
+    if (!project) {
+        return { ok: false, status: 404, error: 'Project not found' };
+    }
+    const bundle = getBundle(bundleId, project.id);
+    if (!bundle) {
+        return { ok: false, status: 404, error: 'Bundle not found' };
+    }
+    const instruction = typeof payload?.instruction === 'string'
+        ? payload.instruction.trim()
+        : '';
+    if (!instruction) {
+        return { ok: false, status: 400, error: 'instruction is required' };
+    }
+    const tickets = listDetailedBundleTickets(project.id, bundle.id).filter(ticket => ticket.state !== 'plan');
+    const targetTicket = resolveBundleTargetTicket(tickets);
+    if (!targetTicket) {
+        return { ok: false, status: 409, error: 'No non-plan tickets are available for follow-up in this bundle' };
+    }
+    const effectiveProject = getEffectiveProject(targetTicket);
+    if (!effectiveProject) {
+        return { ok: false, status: 400, error: 'Ticket project no longer exists' };
+    }
+    const branch = resolveTicketBranch(targetTicket);
+    if (!branch || targetTicket.has_worktree === false || !isWorktreeReady(branch, effectiveProject)) {
+        return { ok: false, status: 400, error: 'Worktree not ready yet' };
+    }
+    const started = startFollowUp(targetTicket, broadcaster, instruction);
+    if (!started) {
+        return { ok: false, status: 409, error: 'Ticket is already running' };
+    }
+    createTicketMessage({
+        ticketId: targetTicket.id,
+        role: 'user',
+        kind: 'follow_up',
+        content: instruction,
+    });
+    return {
+        ok: true,
+        status: 200,
+        value: serializeBundleDetails(project, bundle, {
+            target_ticket_id: targetTicket.id,
+        }),
+    };
+};
 const resolveBundleReviewOwner = (projectId, bundleId) => {
     const tickets = listDetailedBundleTickets(projectId, bundleId);
     const candidate = tickets.find(ticket => {
@@ -1869,6 +1931,9 @@ app.post('/mobile-access/enable', async (req, res) => {
     if (!requireDesktopMobileAccessRequest(req, res)) {
         return;
     }
+    const preferredProjectId = typeof req.body?.preferred_project_id === 'string'
+        ? req.body.preferred_project_id
+        : null;
     const requestedMode = req.body?.mode === 'custom_public_url'
         ? 'custom_public_url'
         : req.body?.mode === 'ngrok'
@@ -1884,7 +1949,10 @@ app.post('/mobile-access/enable', async (req, res) => {
         mode: requestedMode,
         clientBuild: resolveClientBuildPaths(import.meta.url),
         broadcaster: io,
+        preferredProjectId,
         reviewBundleTickets,
+        getBundleDetails: getProjectBundleDetails,
+        submitBundleFollowUp: submitBundleFollowUpResponse,
         publicBaseUrl,
     }));
 });
@@ -1900,7 +1968,10 @@ app.post('/mobile-access/regenerate-pairing', (req, res) => {
         return;
     }
     res.setHeader('Cache-Control', 'no-store');
-    res.json(regenerateMobilePairingChallenge());
+    const preferredProjectId = typeof req.body?.preferred_project_id === 'string'
+        ? req.body.preferred_project_id
+        : null;
+    res.json(regenerateMobilePairingChallenge(preferredProjectId));
 });
 app.post('/mobile-access/sessions/:sessionId/revoke', (req, res) => {
     if (!requireDesktopMobileAccessRequest(req, res)) {
@@ -2839,42 +2910,11 @@ app.post('/bundles/:id/follow-up', (req, res) => {
     if ('error' in result) {
         return res.status(400).json({ error: result.error });
     }
-    const bundle = getBundle(req.params.id, result.project.id);
-    if (!bundle) {
-        return res.status(404).json({ error: 'Bundle not found' });
-    }
-    const instruction = typeof req.body?.instruction === 'string'
-        ? req.body.instruction.trim()
-        : '';
-    if (!instruction) {
-        return res.status(400).json({ error: 'instruction is required' });
-    }
-    const tickets = listDetailedBundleTickets(result.project.id, bundle.id).filter(ticket => ticket.state !== 'plan');
-    const targetTicket = resolveBundleTargetTicket(tickets);
-    if (!targetTicket) {
-        return res.status(409).json({ error: 'No non-plan tickets are available for follow-up in this bundle' });
+    const response = submitBundleFollowUpResponse(result.project.id, req.params.id, req.body, io);
+    if (!response.ok) {
+        return res.status(response.status).json({ error: response.error });
     }
-    const project = getEffectiveProject(targetTicket);
-    if (!project) {
-        return res.status(400).json({ error: 'Ticket project no longer exists' });
-    }
-    const branch = resolveTicketBranch(targetTicket);
-    if (!branch || targetTicket.has_worktree === false || !isWorktreeReady(branch, project)) {
-        return res.status(400).json({ error: 'Worktree not ready yet' });
-    }
-    const started = startFollowUp(targetTicket, io, instruction);
-    if (!started) {
-        return res.status(409).json({ error: 'Ticket is already running' });
-    }
-    createTicketMessage({
-        ticketId: targetTicket.id,
-        role: 'user',
-        kind: 'follow_up',
-        content: instruction,
-    });
-    return res.json(serializeBundleDetails(result.project, bundle, {
-        target_ticket_id: targetTicket.id,
-    }));
+    return res.status(response.status).json(response.value);
 });
 app.get('/tool', (_req, res) => {
     res.json({ tool: config.tool ?? 'opencode' });