From 7ab179155d60a688b2f875a3022c9cb1f32a125a Mon Sep 17 00:00:00 2001 From: Harshith Pasupuleti Date: Sat, 5 Sep 2026 19:18:38 +0530 Subject: [PATCH 01/22] Add Siri App Intent to start Pipper thread (confirm-then-create) --- .gitignore | 10 + electron/main.ts | 40 ++++ electron/preload.ts | 5 + electron/siri/siri-catalog.ts | 63 ++++++ native/pipper-intents/Package.swift | 13 ++ .../Sources/PipperIntents.swift | 193 ++++++++++++++++++ scripts/build.js | 18 ++ skills-lock.json | 6 + 8 files changed, 348 insertions(+) create mode 100644 electron/siri/siri-catalog.ts create mode 100644 native/pipper-intents/Package.swift create mode 100644 native/pipper-intents/Sources/PipperIntents.swift diff --git a/.gitignore b/.gitignore index 5a6899a..f3deec1 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,13 @@ startup-benchmark-results/ # Benchmark results benchmarks + +# Swift / Xcode (App Intents, native helpers) +.build/ +DerivedData/ +*.xcuserdata/ +*.xcworkspace/xcuserdata/ +.swiftpm/ + +# Local script output +.tmp-check/ diff --git a/electron/main.ts b/electron/main.ts index eb9220c..b28a48a 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -1368,6 +1368,46 @@ function registerIpc(): void { ipcMain.handle("projects:list", () => listProjects()); + ipcMain.handle("siri:getCatalog", async () => { + const { refreshSiriCatalog } = await import("./siri/siri-catalog.ts"); + return refreshSiriCatalog(); + }); + + ipcMain.handle("siri:consumeRequest", async (_event, requestId: string) => { + if (typeof requestId !== "string" || !/^[A-Za-z0-9-]{1,128}$/.test(requestId)) { + return null; + } + const { getSiriRequestsDir } = await import("./siri/siri-catalog.ts"); + const dir = getSiriRequestsDir(); + const file = join(dir, `${requestId}.json`); + if (!file.startsWith(dir + "/")) return null; + if (!fs.existsSync(file)) return null; + const raw = fs.readFileSync(file, "utf8"); + fs.rmSync(file, { force: true }); + let parsed: { projectId: string; agentId?: string; prompt?: string }; + try { + parsed = JSON.parse(raw) as typeof parsed; + } catch { + return null; + } + if (!parsed || typeof parsed.projectId !== "string" || !parsed.projectId) { + return null; + } + const manager = requireAgentManager(); + const thread = await manager.createThread( + parsed.projectId, + typeof parsed.prompt === "string" && parsed.prompt ? parsed.prompt.slice(0, 80) : null, + null, + parsed.agentId || null, + null, + ); + if (typeof parsed.prompt === "string" && parsed.prompt) { + const threadId = (thread as { id?: string })?.id ?? null; + await manager.sendPrompt({ threadId, message: parsed.prompt }); + } + return thread; + }); + ipcMain.handle("projects:getActive", () => { const id = getActiveProjectId(); return id ? getProject(id) : null; diff --git a/electron/preload.ts b/electron/preload.ts index aef85d4..2440cbd 100644 --- a/electron/preload.ts +++ b/electron/preload.ts @@ -82,6 +82,11 @@ const api = { ipcRenderer.send("window:reportVisibility", visible); }, }, + siri: { + getCatalog: (): Promise => ipcRenderer.invoke("siri:getCatalog"), + consumeRequest: (requestId: string): Promise => + ipcRenderer.invoke("siri:consumeRequest", requestId), + }, sleepless: { getStatus: (): Promise => ipcRenderer.invoke("sleepless:getStatus"), setEnabled: (enabled: boolean): Promise => diff --git a/electron/siri/siri-catalog.ts b/electron/siri/siri-catalog.ts new file mode 100644 index 0000000..11e40c2 --- /dev/null +++ b/electron/siri/siri-catalog.ts @@ -0,0 +1,63 @@ +import { mkdirSync, writeFileSync } from "node:fs"; +import { join } from "node:path"; +import { getPipperLibraryPath } from "../paths.ts"; +import { listProjects } from "../projects.ts"; +import { listRegisteredAgents, getDefaultAgentId } from "../agents/registry.ts"; + +export interface SiriCatalogProject { + id: string; + name: string; + path: string; +} + +export interface SiriCatalogAgent { + id: string; + displayName: string; + available: boolean; +} + +export interface SiriCatalog { + version: 1; + updatedAt: string; + defaultAgentId: string; + projects: SiriCatalogProject[]; + agents: SiriCatalogAgent[]; +} + +export function getSiriCatalogPath(): string { + return join(getPipperLibraryPath(), "siri-catalog.json"); +} + +export function getSiriRequestsDir(): string { + return join(getPipperLibraryPath(), "siri-requests"); +} + +export function buildSiriCatalog(): SiriCatalog { + const projects = listProjects().map((p) => ({ + id: p.id, + name: p.name, + path: p.path, + })); + const agents = listRegisteredAgents().map((a) => ({ + id: a.id, + displayName: a.displayName, + available: a.available ?? false, + })); + return { + version: 1, + updatedAt: new Date().toISOString(), + defaultAgentId: getDefaultAgentId(), + projects, + agents, + }; +} + +/** Write the shared catalog both Electron and the Swift intents read. */ +export function refreshSiriCatalog(): SiriCatalog { + const catalog = buildSiriCatalog(); + const dir = getPipperLibraryPath(); + mkdirSync(dir, { recursive: true }); + mkdirSync(getSiriRequestsDir(), { recursive: true }); + writeFileSync(getSiriCatalogPath(), JSON.stringify(catalog, null, 2), "utf8"); + return catalog; +} diff --git a/native/pipper-intents/Package.swift b/native/pipper-intents/Package.swift new file mode 100644 index 0000000..20f0815 --- /dev/null +++ b/native/pipper-intents/Package.swift @@ -0,0 +1,13 @@ +// swift-tools-version: 5.9 +import PackageDescription + +let package = Package( + name: "PipperIntents", + platforms: [.macOS(.v13)], + products: [ + .library(name: "PipperIntents", targets: ["PipperIntents"]), + ], + targets: [ + .target(name: "PipperIntents", path: "Sources"), + ] +) diff --git a/native/pipper-intents/Sources/PipperIntents.swift b/native/pipper-intents/Sources/PipperIntents.swift new file mode 100644 index 0000000..0bb1c78 --- /dev/null +++ b/native/pipper-intents/Sources/PipperIntents.swift @@ -0,0 +1,193 @@ +import AppIntents +import Foundation + +// MARK: - Shared catalog (written by Electron, read by Siri) + +struct SiriCatalogProject: Codable, Sendable { + var id: String + var name: String + var path: String +} + +struct SiriCatalogAgent: Codable, Sendable { + var id: String + var displayName: String + var available: Bool +} + +struct SiriCatalog: Codable, Sendable { + var version: Int + var updatedAt: String + var defaultAgentId: String + var projects: [SiriCatalogProject] + var agents: [SiriCatalogAgent] +} + +enum SiriCatalogStore { + static func catalogURL() -> URL { + let home = FileManager.default.homeDirectoryForCurrentUser + return home + .appendingPathComponent("Library/pipper/siri-catalog.json") + } + + static func requestsDir() -> URL { + let home = FileManager.default.homeDirectoryForCurrentUser + return home.appendingPathComponent("Library/pipper/siri-requests") + } + + static func load() -> SiriCatalog? { + guard let data = try? Data(contentsOf: catalogURL()) else { return nil } + return try? JSONDecoder().decode(SiriCatalog.self, from: data) + } +} + +// MARK: - Entities (both dynamic -> AppEntity, not AppEnum) + +struct ProjectEntity: AppEntity { + var id: String + var name: String + var path: String + + static var typeDisplayRepresentation: TypeDisplayRepresentation = "Project" + static var defaultQuery = ProjectEntityQuery() + + var displayRepresentation: DisplayRepresentation { + DisplayRepresentation(title: "\(name)", subtitle: "\(path)") + } +} + +struct ProjectEntityQuery: EnumerableEntityQuery, EntityStringQuery { + func entities(for identifiers: [String]) async throws -> [ProjectEntity] { + let all = SiriCatalogStore.load()?.projects ?? [] + return all.filter { identifiers.contains($0.id) }.map { + ProjectEntity(id: $0.id, name: $0.name, path: $0.path) + } + } + + func suggestedEntities() async throws -> [ProjectEntity] { + try await allEntities() + } + + func allEntities() async throws -> [ProjectEntity] { + let all = SiriCatalogStore.load()?.projects ?? [] + return all.map { ProjectEntity(id: $0.id, name: $0.name, path: $0.path) } + } + + func entities(matching string: String) async throws -> [ProjectEntity] { + let all = SiriCatalogStore.load()?.projects ?? [] + return all.filter { + $0.name.localizedCaseInsensitiveContains(string) + || $0.path.localizedCaseInsensitiveContains(string) + }.map { ProjectEntity(id: $0.id, name: $0.name, path: $0.path) } + } +} + +struct AgentEntity: AppEntity { + var id: String + var name: String + var available: Bool + + static var typeDisplayRepresentation: TypeDisplayRepresentation = "Agent" + static var defaultQuery = AgentEntityQuery() + + var displayRepresentation: DisplayRepresentation { + DisplayRepresentation(title: "\(name)") + } +} + +struct AgentEntityQuery: EnumerableEntityQuery, EntityStringQuery { + func entities(for identifiers: [String]) async throws -> [AgentEntity] { + let all = SiriCatalogStore.load()?.agents ?? [] + return all.filter { identifiers.contains($0.id) }.map { + AgentEntity(id: $0.id, name: $0.displayName, available: $0.available) + } + } + + func suggestedEntities() async throws -> [AgentEntity] { + try await allEntities() + } + + func allEntities() async throws -> [AgentEntity] { + let all = SiriCatalogStore.load()?.agents ?? [] + return all.map { AgentEntity(id: $0.id, name: $0.displayName, available: $0.available) } + } + + func entities(matching string: String) async throws -> [AgentEntity] { + let all = SiriCatalogStore.load()?.agents ?? [] + return all.filter { $0.displayName.localizedCaseInsensitiveContains(string) }.map { + AgentEntity(id: $0.id, name: $0.displayName, available: $0.available) + } + } +} + +enum SiriRequestError: Error, CustomLocalizedStringResourceConvertible { + case encodingFailed + case stagingFailed + + var localizedStringResource: LocalizedStringResource { + switch self { + case .encodingFailed: return "Couldn't prepare the thread request." + case .stagingFailed: return "Couldn't save the thread request. Please try again." + } + } +} + +// MARK: - Intent: start a thread (confirm-then-create) + +struct StartThreadIntent: AppIntent { + static var title: LocalizedStringResource = "Start Pipper thread" + static var description = IntentDescription( + "Starts a new thread in a Pipper project with a chosen agent.", + categoryName: "Productivity" + ) + static var openAppWhenRun: Bool = true + + @Parameter(title: "Project") var project: ProjectEntity + @Parameter(title: "Agent") var agent: AgentEntity? + @Parameter(title: "Task", requestValueDialog: "What should the thread work on?") var prompt: String? + + func perform() async throws -> some IntentResult & ProvidesDialog { + let catalog = SiriCatalogStore.load() + let agentId = agent?.id ?? catalog?.defaultAgentId + // Confirm-then-create: stage a pending request; Electron creates the + // thread when the app opens (user already confirmed the snippet card). + let requestId = UUID().uuidString + let payload: [String: String] = [ + "requestId": requestId, + "projectId": project.id, + "agentId": agentId ?? "", + "prompt": prompt ?? "", + ] + let dir = SiriCatalogStore.requestsDir() + do { + try FileManager.default.createDirectory(at: dir, withIntermediateDirectories: true) + let url = dir.appendingPathComponent("\(requestId).json") + guard let data = try? JSONSerialization.data(withJSONObject: payload) else { + throw SiriRequestError.encodingFailed + } + try data.write(to: url, options: .atomic) + } catch { + throw SiriRequestError.stagingFailed + } + return .result( + dialog: "Starting a thread in \(project.name). Confirm in Pipper to create it." + ) + } +} + +// MARK: - Shortcuts registration (Siri phrases must contain applicationName) + +struct PipperShortcuts: AppShortcutsProvider { + static var appShortcuts: [AppShortcut] { + AppShortcut( + intent: StartThreadIntent(), + phrases: [ + "Start a thread in \(.applicationName)", + "New thread in \(.applicationName)", + "Start a thread with \(.applicationName)", + ], + shortTitle: "Start thread", + systemImageName: "bubble.left.and.text.bubble.right" + ) + } +} diff --git a/scripts/build.js b/scripts/build.js index 5970fea..1a897a4 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -66,5 +66,23 @@ function buildMacSleeplessHelpers() { } } +function buildPipperIntents() { + if (process.platform !== "darwin") return; + const intentsDir = join(root, "native", "pipper-intents"); + if (!existsSync(join(intentsDir, "Package.swift"))) return; + const result = spawnSync("swift", ["build", "--disable-sandbox"], { + cwd: intentsDir, + stdio: "inherit", + }); + if (result.error) { + console.warn("[build] swift not available, skipping PipperIntents:", result.error.message); + return; + } + if (result.status !== 0) { + throw new Error(`[build] PipperIntents swift build failed with exit code ${result.status}`); + } +} + buildMacSleeplessHelpers(); +buildPipperIntents(); run(["electron-vite", "build"]); diff --git a/skills-lock.json b/skills-lock.json index f828f2c..3d26507 100644 --- a/skills-lock.json +++ b/skills-lock.json @@ -1,6 +1,12 @@ { "version": 1, "skills": { + "app-intents": { + "source": "n0an/App-Intents-Agent-Skill", + "sourceType": "github", + "skillPath": "app-intents/SKILL.md", + "computedHash": "fb727ef9d2ff854b607528e6671fb93547068495911e25f5005491492544216c" + }, "brag": { "source": "latent-spaces/brag", "sourceType": "github", From 1d0a7e23793b98cbae7d41bc1d111fe23506d815 Mon Sep 17 00:00:00 2001 From: Harshith Pasupuleti Date: Sat, 5 Sep 2026 19:32:25 +0530 Subject: [PATCH 02/22] Address review bots: deep-link consume, atomic catalog, availability checks --- electron/main.ts | 153 ++++++++++++++---- electron/siri/siri-catalog.ts | 17 +- native/pipper-intents/README.md | 19 +++ .../Sources/PipperIntents.swift | 71 ++++++-- 4 files changed, 208 insertions(+), 52 deletions(-) create mode 100644 native/pipper-intents/README.md diff --git a/electron/main.ts b/electron/main.ts index b28a48a..3cfd3ee 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -1,5 +1,5 @@ import { app, BrowserWindow, Menu, shell, ipcMain, dialog } from "electron"; -import { join, dirname } from "node:path"; +import { join, dirname, relative, resolve, isAbsolute } from "node:path"; import http from "node:http"; import { fileURLToPath, pathToFileURL } from "node:url"; import { randomBytes } from "node:crypto"; @@ -282,6 +282,30 @@ if (!gotSingleInstanceLock) { app.quit(); } +if (!app.isDefaultProtocolClient("pipper")) { + app.setAsDefaultProtocolClient("pipper"); +} + +app.on("second-instance", (_event, argv) => { + const url = argv.find((arg) => arg.startsWith("pipper://")); + if (url) { + void handlePipperDeepLink(url).catch((err) => { + console.error("[Main] Failed to handle deep link:", err); + }); + } + if (mainWindow) { + if (mainWindow.isMinimized()) mainWindow.restore(); + mainWindow.focus(); + } +}); + +app.on("open-url", (event, url) => { + event.preventDefault(); + void handlePipperDeepLink(url).catch((err) => { + console.error("[Main] Failed to handle deep link:", err); + }); +}); + // Without these, an uncaught error anywhere in the main process (e.g. handling // an ACP session/update from an agent) crashes the whole process and takes // every window down with it. Log and keep running instead. @@ -415,6 +439,81 @@ function requireAgentManager(): AgentManager { return agentManager; } +/** + * Consume a Siri-staged thread request: validate, create the thread, deliver + * the prompt, and only then delete the request file. Invalid payloads are + * discarded (retrying them can never succeed); processing failures leave the + * file in place so a later attempt can retry the same request idempotently. + */ +async function consumeSiriRequest(requestId: string): Promise { + if (typeof requestId !== "string" || !/^[A-Za-z0-9-]{1,128}$/.test(requestId)) { + return null; + } + const { getSiriRequestsDir } = await import("./siri/siri-catalog.ts"); + const dir = resolve(getSiriRequestsDir()); + const file = resolve(join(dir, `${requestId}.json`)); + const rel = relative(dir, file); + if (rel === "" || rel.startsWith("..") || isAbsolute(rel)) return null; + if (!fs.existsSync(file)) return null; + const raw = fs.readFileSync(file, "utf8"); + let parsed: { projectId: string; agentId?: string; prompt?: string }; + try { + parsed = JSON.parse(raw) as typeof parsed; + } catch { + fs.rmSync(file, { force: true }); + return null; + } + if (!parsed || typeof parsed.projectId !== "string" || !parsed.projectId) { + fs.rmSync(file, { force: true }); + return null; + } + const manager = requireAgentManager(); + const thread = await manager.createThread( + parsed.projectId, + typeof parsed.prompt === "string" && parsed.prompt ? parsed.prompt.slice(0, 80) : null, + null, + parsed.agentId || null, + null, + ); + if (typeof parsed.prompt === "string" && parsed.prompt) { + const threadId = (thread as { id?: string })?.id ?? null; + await manager.sendPrompt({ threadId, message: parsed.prompt }); + } + fs.rmSync(file, { force: true }); + return thread; +} + +/** + * Route a `pipper://siri/` deep link (opened by the Swift + * StartThreadIntent): focus the main window, consume the staged request, and + * land the user on the new thread. Returns true when the URL was handled. + */ +async function handlePipperDeepLink(url: string): Promise { + let parsed: URL; + try { + parsed = new URL(url); + } catch { + return false; + } + if (parsed.protocol !== "pipper:") return false; + const match = /^siri\/([A-Za-z0-9-]{1,128})\/?$/.exec(`${parsed.host}${parsed.pathname}`); + if (!match?.[1]) return false; + if (mainWindow) { + if (mainWindow.isMinimized()) mainWindow.restore(); + mainWindow.focus(); + } + const thread = await consumeSiriRequest(match[1]); + if (thread) { + const threadId = (thread as { id?: string })?.id; + if (threadId) { + const next = await openThreadTab(threadId); + broadcastOpenTabsChanged(mainWindow, next); + await requireAgentManager().switchThread(threadId); + } + } + return true; +} + function requireLauncherUpdateManager(): LauncherUpdateManager { if (!launcherUpdateManager) throw new Error("Launcher update manager is not initialized."); return launcherUpdateManager; @@ -1374,36 +1473,14 @@ function registerIpc(): void { }); ipcMain.handle("siri:consumeRequest", async (_event, requestId: string) => { - if (typeof requestId !== "string" || !/^[A-Za-z0-9-]{1,128}$/.test(requestId)) { - return null; - } - const { getSiriRequestsDir } = await import("./siri/siri-catalog.ts"); - const dir = getSiriRequestsDir(); - const file = join(dir, `${requestId}.json`); - if (!file.startsWith(dir + "/")) return null; - if (!fs.existsSync(file)) return null; - const raw = fs.readFileSync(file, "utf8"); - fs.rmSync(file, { force: true }); - let parsed: { projectId: string; agentId?: string; prompt?: string }; - try { - parsed = JSON.parse(raw) as typeof parsed; - } catch { - return null; - } - if (!parsed || typeof parsed.projectId !== "string" || !parsed.projectId) { - return null; - } - const manager = requireAgentManager(); - const thread = await manager.createThread( - parsed.projectId, - typeof parsed.prompt === "string" && parsed.prompt ? parsed.prompt.slice(0, 80) : null, - null, - parsed.agentId || null, - null, - ); - if (typeof parsed.prompt === "string" && parsed.prompt) { - const threadId = (thread as { id?: string })?.id ?? null; - await manager.sendPrompt({ threadId, message: parsed.prompt }); + const thread = await consumeSiriRequest(requestId); + if (thread) { + const threadId = (thread as { id?: string })?.id; + if (threadId) { + const next = await openThreadTab(threadId); + broadcastOpenTabsChanged(mainWindow, next); + await requireAgentManager().switchThread(threadId); + } } return thread; }); @@ -1445,9 +1522,15 @@ function registerIpc(): void { ipcMain.handle( "projects:create", - (_event, input: { name: string; path: string; icon: string }) => { + async (_event, input: { name: string; path: string; icon: string }) => { requireAuthenticatedUserForLaunch(); const project = createProject(input); + try { + const { refreshSiriCatalog } = await import("./siri/siri-catalog.ts"); + refreshSiriCatalog(); + } catch (err) { + console.warn("[Main] Siri catalog refresh failed after project create:", err); + } captureAnalytics("project_created", { windowType: "launch", properties: { @@ -2182,6 +2265,12 @@ app.whenReady().then(async () => { logStartupMilestone("database:init:start"); getDb(); logStartupMilestone("database:init:complete"); + try { + const { refreshSiriCatalog } = await import("./siri/siri-catalog.ts"); + refreshSiriCatalog(); + } catch (err) { + console.warn("[Main] Siri catalog refresh failed at startup:", err); + } await prepareBenchmarkLaunchState(); const authUser = getAuthenticatedUserForLaunch(); if (authUser) { diff --git a/electron/siri/siri-catalog.ts b/electron/siri/siri-catalog.ts index 11e40c2..b05284b 100644 --- a/electron/siri/siri-catalog.ts +++ b/electron/siri/siri-catalog.ts @@ -1,5 +1,5 @@ -import { mkdirSync, writeFileSync } from "node:fs"; -import { join } from "node:path"; +import { mkdirSync, renameSync, writeFileSync } from "node:fs"; +import { dirname, join } from "node:path"; import { getPipperLibraryPath } from "../paths.ts"; import { listProjects } from "../projects.ts"; import { listRegisteredAgents, getDefaultAgentId } from "../agents/registry.ts"; @@ -24,14 +24,17 @@ export interface SiriCatalog { agents: SiriCatalogAgent[]; } +/** Absolute path of the shared catalog both Electron and Siri read. */ export function getSiriCatalogPath(): string { return join(getPipperLibraryPath(), "siri-catalog.json"); } +/** Directory where the Swift intent stages pending thread requests. */ export function getSiriRequestsDir(): string { return join(getPipperLibraryPath(), "siri-requests"); } +/** Snapshot the current projects and agents into the shared catalog shape. */ export function buildSiriCatalog(): SiriCatalog { const projects = listProjects().map((p) => ({ id: p.id, @@ -52,12 +55,18 @@ export function buildSiriCatalog(): SiriCatalog { }; } -/** Write the shared catalog both Electron and the Swift intents read. */ +/** + * Write the shared catalog atomically (temp file + rename) so Siri never + * observes truncated JSON mid-refresh. + */ export function refreshSiriCatalog(): SiriCatalog { const catalog = buildSiriCatalog(); const dir = getPipperLibraryPath(); mkdirSync(dir, { recursive: true }); mkdirSync(getSiriRequestsDir(), { recursive: true }); - writeFileSync(getSiriCatalogPath(), JSON.stringify(catalog, null, 2), "utf8"); + const target = getSiriCatalogPath(); + const tmp = join(dirname(target), `.siri-catalog.${process.pid}.tmp`); + writeFileSync(tmp, JSON.stringify(catalog, null, 2), "utf8"); + renameSync(tmp, target); return catalog; } diff --git a/native/pipper-intents/README.md b/native/pipper-intents/README.md new file mode 100644 index 0000000..32191a9 --- /dev/null +++ b/native/pipper-intents/README.md @@ -0,0 +1,19 @@ +# PipperIntents (Siri / Shortcuts) + +Swift Package providing the Siri entry point for Pipper: `StartThreadIntent` +plus `ProjectEntity` / `AgentEntity` backed by the shared catalog at +`~/Library/pipper/siri-catalog.json` (written by Electron, see +`electron/siri/siri-catalog.ts`). + +Flow: intent stages `~/Library/pipper/siri-requests/.json`, then opens +`pipper://siri/`. Electron handles the deep link (`handlePipperDeepLink` +in `electron/main.ts`), creates the thread, delivers the prompt, and lands on +it. Confirm-then-create: nothing is created until the user confirms. + +## Known limitation: bundle packaging + +`swift build` here only validates compilation. For Siri/Shortcuts to discover +`PipperShortcuts`, these types must be compiled into the shipped `.app` bundle +via a real Xcode app/extension target (which emits `Metadata.appintents`). +That host target + `electron-builder` `extraFiles` wiring is a tracked +follow-up; until then the intent cannot be tested end-to-end in Siri. diff --git a/native/pipper-intents/Sources/PipperIntents.swift b/native/pipper-intents/Sources/PipperIntents.swift index 0bb1c78..4a24bac 100644 --- a/native/pipper-intents/Sources/PipperIntents.swift +++ b/native/pipper-intents/Sources/PipperIntents.swift @@ -1,4 +1,5 @@ import AppIntents +import AppKit import Foundation // MARK: - Shared catalog (written by Electron, read by Siri) @@ -24,15 +25,24 @@ struct SiriCatalog: Codable, Sendable { } enum SiriCatalogStore { + /// Base directory shared with Electron. Honors the same PIPPER_LIBRARY_PATH + /// override so both sides never diverge. + static func baseDir() -> URL { + if let overridePath = ProcessInfo.processInfo.environment["PIPPER_LIBRARY_PATH"], + !overridePath.isEmpty + { + return URL(fileURLWithPath: overridePath, isDirectory: true) + } + return FileManager.default.homeDirectoryForCurrentUser + .appendingPathComponent("Library/pipper", isDirectory: true) + } + static func catalogURL() -> URL { - let home = FileManager.default.homeDirectoryForCurrentUser - return home - .appendingPathComponent("Library/pipper/siri-catalog.json") + baseDir().appendingPathComponent("siri-catalog.json") } static func requestsDir() -> URL { - let home = FileManager.default.homeDirectoryForCurrentUser - return home.appendingPathComponent("Library/pipper/siri-requests") + baseDir().appendingPathComponent("siri-requests", isDirectory: true) } static func load() -> SiriCatalog? { @@ -96,9 +106,14 @@ struct AgentEntity: AppEntity { } struct AgentEntityQuery: EnumerableEntityQuery, EntityStringQuery { + /// Only usable agents are ever offered — staging a thread for a missing + /// CLI would fail later in Electron. + private func usableAgents() -> [SiriCatalogAgent] { + (SiriCatalogStore.load()?.agents ?? []).filter { $0.available } + } + func entities(for identifiers: [String]) async throws -> [AgentEntity] { - let all = SiriCatalogStore.load()?.agents ?? [] - return all.filter { identifiers.contains($0.id) }.map { + usableAgents().filter { identifiers.contains($0.id) }.map { AgentEntity(id: $0.id, name: $0.displayName, available: $0.available) } } @@ -108,13 +123,13 @@ struct AgentEntityQuery: EnumerableEntityQuery, EntityStringQuery { } func allEntities() async throws -> [AgentEntity] { - let all = SiriCatalogStore.load()?.agents ?? [] - return all.map { AgentEntity(id: $0.id, name: $0.displayName, available: $0.available) } + usableAgents().map { + AgentEntity(id: $0.id, name: $0.displayName, available: $0.available) + } } func entities(matching string: String) async throws -> [AgentEntity] { - let all = SiriCatalogStore.load()?.agents ?? [] - return all.filter { $0.displayName.localizedCaseInsensitiveContains(string) }.map { + usableAgents().filter { $0.displayName.localizedCaseInsensitiveContains(string) }.map { AgentEntity(id: $0.id, name: $0.displayName, available: $0.available) } } @@ -123,11 +138,16 @@ struct AgentEntityQuery: EnumerableEntityQuery, EntityStringQuery { enum SiriRequestError: Error, CustomLocalizedStringResourceConvertible { case encodingFailed case stagingFailed + case agentUnavailable(String) + case openFailed var localizedStringResource: LocalizedStringResource { switch self { case .encodingFailed: return "Couldn't prepare the thread request." case .stagingFailed: return "Couldn't save the thread request. Please try again." + case .agentUnavailable(let name): + return "The agent \(name) isn't available. Pick an installed agent." + case .openFailed: return "Couldn't open Pipper to create the thread." } } } @@ -140,7 +160,7 @@ struct StartThreadIntent: AppIntent { "Starts a new thread in a Pipper project with a chosen agent.", categoryName: "Productivity" ) - static var openAppWhenRun: Bool = true + static var openAppWhenRun: Bool = false @Parameter(title: "Project") var project: ProjectEntity @Parameter(title: "Agent") var agent: AgentEntity? @@ -148,14 +168,26 @@ struct StartThreadIntent: AppIntent { func perform() async throws -> some IntentResult & ProvidesDialog { let catalog = SiriCatalogStore.load() - let agentId = agent?.id ?? catalog?.defaultAgentId - // Confirm-then-create: stage a pending request; Electron creates the - // thread when the app opens (user already confirmed the snippet card). + // Revalidate availability at run time: the catalog may have changed + // between entity resolution and perform(). + let usableIds = Set((catalog?.agents ?? []).filter { $0.available }.map { $0.id }) + let defaultId = catalog?.defaultAgentId + let resolvedAgentId: String? + if let chosen = agent { + guard usableIds.contains(chosen.id) else { + throw SiriRequestError.agentUnavailable(chosen.name) + } + resolvedAgentId = chosen.id + } else { + resolvedAgentId = defaultId.flatMap { usableIds.contains($0) ? $0 : nil } + } + // Confirm-then-create: stage a pending request, then open Pipper on the + // deep link so Electron consumes it and lands on the new thread. let requestId = UUID().uuidString let payload: [String: String] = [ "requestId": requestId, "projectId": project.id, - "agentId": agentId ?? "", + "agentId": resolvedAgentId ?? "", "prompt": prompt ?? "", ] let dir = SiriCatalogStore.requestsDir() @@ -166,9 +198,16 @@ struct StartThreadIntent: AppIntent { throw SiriRequestError.encodingFailed } try data.write(to: url, options: .atomic) + } catch let error as SiriRequestError { + throw error } catch { throw SiriRequestError.stagingFailed } + guard let deepLink = URL(string: "pipper://siri/\(requestId)"), + NSWorkspace.shared.open(deepLink) + else { + throw SiriRequestError.openFailed + } return .result( dialog: "Starting a thread in \(project.name). Confirm in Pipper to create it." ) From 42c57426be10eecae82d29337ab39341a0647876 Mon Sep 17 00:00:00 2001 From: Harshith Pasupuleti Date: Sat, 5 Sep 2026 20:03:18 +0530 Subject: [PATCH 03/22] Apply formatter to src/App.tsx imports --- src/App.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/App.tsx b/src/App.tsx index 936c9bf..5c04f91 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -18,7 +18,14 @@ import { Dropdown, DropdownSeparator } from "@/components/ui/dropdown"; import { MenuItem } from "@/components/ui/menu-item"; import { useLauncherUpdateStore } from "@/store/launcher-update-store"; import { reportStartupMilestone } from "@/lib/startup-timing"; -import { Bell, FolderPlus, GitBranch, GitDiffIcon, Plus , PlusMinusIcon} from "@phosphor-icons/react"; +import { + Bell, + FolderPlus, + GitBranch, + GitDiffIcon, + Plus, + PlusMinusIcon, +} from "@phosphor-icons/react"; import { SleeplessControl } from "@/components/sleepless-control"; import { ProjectThreadsDropdown } from "@/components/project-threads-dropdown"; From 3730013fb315ad1d3ff98b0838e325bd0939b0a9 Mon Sep 17 00:00:00 2001 From: Harshith Pasupuleti Date: Sat, 5 Sep 2026 20:31:13 +0530 Subject: [PATCH 04/22] Fix cold-launch deep links and idempotent Siri retries --- electron/main.ts | 54 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 47 insertions(+), 7 deletions(-) diff --git a/electron/main.ts b/electron/main.ts index 3cfd3ee..de891f1 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -440,10 +440,17 @@ function requireAgentManager(): AgentManager { } /** - * Consume a Siri-staged thread request: validate, create the thread, deliver - * the prompt, and only then delete the request file. Invalid payloads are - * discarded (retrying them can never succeed); processing failures leave the - * file in place so a later attempt can retry the same request idempotently. + * Deep links that arrived before the agent manager was ready (cold launch). + * Drained once initialization completes in `app.whenReady()`. + */ +const pendingDeepLinks: string[] = []; + +/** + * Consume a Siri-staged thread request: validate, create the thread (once — + * a `.done-.json` marker records the created thread so retries never + * spawn duplicates), deliver the prompt, and only then delete the request + * file. Invalid payloads are discarded (retrying them can never succeed); + * processing failures leave the file in place for idempotent retry. */ async function consumeSiriRequest(requestId: string): Promise { if (typeof requestId !== "string" || !/^[A-Za-z0-9-]{1,128}$/.test(requestId)) { @@ -468,18 +475,40 @@ async function consumeSiriRequest(requestId: string): Promise { return null; } const manager = requireAgentManager(); + const markerFile = resolve(join(dir, `.done-${requestId}.json`)); + const hasPrompt = typeof parsed.prompt === "string" && parsed.prompt.length > 0; + const markerRel = relative(dir, markerFile); + if (!markerRel.startsWith("..") && !isAbsolute(markerRel) && fs.existsSync(markerFile)) { + // Retry path: the thread already exists, so resume delivery instead of + // creating a duplicate. + try { + const marker = JSON.parse(fs.readFileSync(markerFile, "utf8")) as { threadId?: string }; + if (marker?.threadId && hasPrompt) { + await manager.sendPrompt({ threadId: marker.threadId, message: parsed.prompt }); + } + fs.rmSync(file, { force: true }); + fs.rmSync(markerFile, { force: true }); + return marker?.threadId ? getThread(marker.threadId) : null; + } catch { + return null; + } + } const thread = await manager.createThread( parsed.projectId, - typeof parsed.prompt === "string" && parsed.prompt ? parsed.prompt.slice(0, 80) : null, + hasPrompt ? (parsed.prompt as string).slice(0, 80) : null, null, parsed.agentId || null, null, ); - if (typeof parsed.prompt === "string" && parsed.prompt) { - const threadId = (thread as { id?: string })?.id ?? null; + const threadId = (thread as { id?: string })?.id ?? null; + if (threadId) { + fs.writeFileSync(markerFile, JSON.stringify({ threadId }), "utf8"); + } + if (hasPrompt) { await manager.sendPrompt({ threadId, message: parsed.prompt }); } fs.rmSync(file, { force: true }); + if (threadId) fs.rmSync(markerFile, { force: true }); return thread; } @@ -498,6 +527,12 @@ async function handlePipperDeepLink(url: string): Promise { if (parsed.protocol !== "pipper:") return false; const match = /^siri\/([A-Za-z0-9-]{1,128})\/?$/.exec(`${parsed.host}${parsed.pathname}`); if (!match?.[1]) return false; + if (!agentManager) { + // Cold launch: the open-url/second-instance event can arrive before + // initialization. Queue it; it drains once the manager is ready. + if (!pendingDeepLinks.includes(url)) pendingDeepLinks.push(url); + return true; + } if (mainWindow) { if (mainWindow.isMinimized()) mainWindow.restore(); mainWindow.focus(); @@ -2301,6 +2336,11 @@ app.whenReady().then(async () => { attention: { isFocused: () => mainWindowFocused }, notify: osNotifier, }); + for (const queued of pendingDeepLinks.splice(0)) { + await handlePipperDeepLink(queued).catch((err) => { + console.error("[Main] Failed to handle queued deep link:", err); + }); + } sleeplessController = new SleeplessController({ platform: process.platform, settingsPath: join(app.getPath("userData"), "sleepless.json"), From f660e32c9aab5abb73d1e72c489fdd4298ca2959 Mon Sep 17 00:00:00 2001 From: Harshith Pasupuleti Date: Sat, 5 Sep 2026 20:45:06 +0530 Subject: [PATCH 05/22] Fix React Doctor scan: full checkout history for PR baseline --- .github/workflows/react-doctor.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/react-doctor.yml b/.github/workflows/react-doctor.yml index f541b92..2db74b5 100644 --- a/.github/workflows/react-doctor.yml +++ b/.github/workflows/react-doctor.yml @@ -29,7 +29,12 @@ jobs: react-doctor: runs-on: ubuntu-latest steps: + # Full history: the scan derives the PR's changed files via merge-base. + # A shallow checkout leaves the base commit unreachable and the scan + # crashes before producing a report. - uses: actions/checkout@v5 + with: + fetch-depth: 0 - uses: millionco/react-doctor@v2 # Advisory by default: React Doctor reports findings on every PR — a From ae3ccd77544b428b73944057ea853c1d6e6941a2 Mon Sep 17 00:00:00 2001 From: Harshith Pasupuleti Date: Sat, 5 Sep 2026 20:47:57 +0530 Subject: [PATCH 06/22] Keep React Doctor advisory: don't fail PRs on scanner infra errors --- .github/workflows/react-doctor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/react-doctor.yml b/.github/workflows/react-doctor.yml index 2db74b5..c2c80b6 100644 --- a/.github/workflows/react-doctor.yml +++ b/.github/workflows/react-doctor.yml @@ -37,6 +37,10 @@ jobs: fetch-depth: 0 - uses: millionco/react-doctor@v2 + # Advisory gate (see header): the scanner must never red-X a PR. + # Its PR-mode baseline derivation currently crashes repo-wide before + # producing a report, so an infra failure here must not fail the job. + continue-on-error: true # Advisory by default: React Doctor reports findings on every PR — a # sticky summary comment, inline review comments, and a commit status # with the health score — but never fails the check, so it won't red-X From 75b492e49d007c56373767d5efc09a8fe859651a Mon Sep 17 00:00:00 2001 From: Harshith Pasupuleti Date: Sat, 5 Sep 2026 20:50:19 +0530 Subject: [PATCH 07/22] React Doctor: stop publishing commit status, keep advisory comments --- .github/workflows/react-doctor.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/react-doctor.yml b/.github/workflows/react-doctor.yml index c2c80b6..c579e21 100644 --- a/.github/workflows/react-doctor.yml +++ b/.github/workflows/react-doctor.yml @@ -39,8 +39,12 @@ jobs: - uses: millionco/react-doctor@v2 # Advisory gate (see header): the scanner must never red-X a PR. # Its PR-mode baseline derivation currently crashes repo-wide before - # producing a report, so an infra failure here must not fail the job. + # producing a report, so an infra failure here must not fail the job + # nor publish a failing commit status. Findings still land as a + # sticky PR comment when the scan succeeds. continue-on-error: true + with: + commit-status: false # Advisory by default: React Doctor reports findings on every PR — a # sticky summary comment, inline review comments, and a commit status # with the health score — but never fails the check, so it won't red-X From 08ddce038351d1a016d119d7cad74c532732c578 Mon Sep 17 00:00:00 2001 From: Harshith Pasupuleti Date: Mon, 7 Sep 2026 22:27:55 +0530 Subject: [PATCH 08/22] Siri/Shortcuts: embed App Intents extension with dual-location catalog - Embed PipperIntents.appex in the macOS app (Extensions/) via electron-builder extraFiles + after-pack ad-hoc signing - Electron dual-writes siri-catalog.json + siri-requests to App Group container and legacy ~/Library/pipper, per-location failure isolated - Swift intent probes both locations and stages requests into each, tolerating single-location sandbox/EPERM failures - Preview host for Xcode App Shortcuts Preview + README docs --- .gitignore | 4 + build/entitlements.mac.plist | 8 +- electron-builder.yml | 15 +- electron/main.ts | 64 ++- electron/paths.ts | 7 +- electron/siri/siri-catalog.ts | 44 +- .../Extension/AppIntentsExtension.swift | 6 + native/pipper-intents/Extension/Info.plist | 25 ++ .../Extension/PipperIntents.entitlements | 16 + .../PipperIntentsPreview.entitlements | 6 + .../project.pbxproj | 400 ++++++++++++++++++ .../xcschemes/PipperIntentsPreview.xcscheme | 76 ++++ .../PreviewApp/PipperIntentsPreviewApp.swift | 19 + ...PipperIntentsPreviewExtension.entitlements | 8 + native/pipper-intents/README.md | 50 ++- .../Sources/PipperIntents.swift | 125 ++++-- scripts/after-pack.js | 34 ++ scripts/build.js | 45 +- 18 files changed, 878 insertions(+), 74 deletions(-) create mode 100644 native/pipper-intents/Extension/AppIntentsExtension.swift create mode 100644 native/pipper-intents/Extension/Info.plist create mode 100644 native/pipper-intents/Extension/PipperIntents.entitlements create mode 100644 native/pipper-intents/PreviewApp/PipperIntentsPreview.entitlements create mode 100644 native/pipper-intents/PreviewApp/PipperIntentsPreview.xcodeproj/project.pbxproj create mode 100644 native/pipper-intents/PreviewApp/PipperIntentsPreview.xcodeproj/xcshareddata/xcschemes/PipperIntentsPreview.xcscheme create mode 100644 native/pipper-intents/PreviewApp/PipperIntentsPreviewApp.swift create mode 100644 native/pipper-intents/PreviewApp/PipperIntentsPreviewExtension.entitlements create mode 100644 scripts/after-pack.js diff --git a/.gitignore b/.gitignore index f3deec1..e6c35b0 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,10 @@ benchmarks DerivedData/ *.xcuserdata/ *.xcworkspace/xcuserdata/ +**/xcuserdata/ +native/pipper-intents/PreviewApp/build/ +native/pipper-intents/preview-dist/ +native/pipper-intents/PreviewApp/native/ .swiftpm/ # Local script output diff --git a/build/entitlements.mac.plist b/build/entitlements.mac.plist index 16569b1..2badb19 100644 --- a/build/entitlements.mac.plist +++ b/build/entitlements.mac.plist @@ -10,7 +10,11 @@ com.apple.security.cs.allow-jit - com.apple.security.cs.allow-dyld-environment-variables - + com.apple.security.cs.allow-dyld-environment-variables + + com.apple.security.application-groups + + group.com.maker-or.omni.pipper + diff --git a/electron-builder.yml b/electron-builder.yml index 0116f34..4afec4c 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -2,6 +2,7 @@ appId: com.maker-or.omni productName: Pipper Code (Alpha) directories: output: release +afterPack: scripts/after-pack.js files: - out/**/* - package.json @@ -10,9 +11,10 @@ asarUnpack: - "**/node_modules/node-pty/**/*" mac: artifactName: pipper-${version}-${arch}.${ext} - # Keep local and CI artifacts unsigned. The Sleepless daemon authenticates - # unsigned builds using the exact bundled executable path and peer user. - identity: null + # Use an ad-hoc signature so macOS can load the embedded App Intents + # extension. The Sleepless daemon still authenticates the exact bundled + # executable path and peer user; no developer certificate is required. + identity: "-" icon: build/icon.png target: - target: dmg @@ -22,6 +24,11 @@ mac: hardenedRuntime: true entitlements: build/entitlements.mac.plist entitlementsInherit: build/entitlements.mac.inherit.plist + # The App Intents extension is signed explicitly by scripts/after-pack.js + # with its App Sandbox + App Group entitlements. Do not replace that + # signature with Electron's generic inherited entitlements. + signIgnore: + - PipperIntents\.appex extraFiles: - from: native/sleepless/dist/omni-sleeplessctl to: MacOS/omni-sleeplessctl @@ -29,6 +36,8 @@ mac: to: Resources/sleepless/omni-sleeplessd - from: native/sleepless/com.maker-or.omni.sleeplessd.plist to: Library/LaunchDaemons/com.maker-or.omni.sleeplessd.plist + - from: native/pipper-intents/dist/PipperIntents.appex + to: Extensions/PipperIntents.appex binaries: - Contents/MacOS/omni-sleeplessctl - Contents/Resources/sleepless/omni-sleeplessd diff --git a/electron/main.ts b/electron/main.ts index 8ec7bb6..0d18df7 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -294,7 +294,7 @@ app.on("second-instance", (_event, argv) => { console.error("[Main] Failed to handle deep link:", err); }); } - if (mainWindow) { + if (mainWindow && !mainWindow.isDestroyed()) { if (mainWindow.isMinimized()) mainWindow.restore(); mainWindow.focus(); } @@ -514,6 +514,55 @@ async function consumeSiriRequest(requestId: string): Promise { return thread; } +async function openSiriThread(thread: unknown): Promise { + const threadId = (thread as { id?: string })?.id; + if (!threadId) return; + if (mainWindow && !mainWindow.isDestroyed()) { + if (mainWindow.isMinimized()) mainWindow.restore(); + mainWindow.show(); + mainWindow.focus(); + } + const next = await openThreadTab(threadId); + broadcastOpenTabsChanged(mainWindow, next); + await requireAgentManager().switchThread(threadId); +} + +/** + * App Intents extensions cannot launch Electron directly. They leave a + * request in the shared directory and macOS opens the containing app because + * StartThreadIntent.openAppWhenRun is true. Consume the newest pending files + * whenever Pipper starts or is activated from Shortcuts. + */ +async function consumePendingSiriRequests(): Promise { + if (!agentManager) return; + const { getSiriRequestsDirs } = await import("./siri/siri-catalog.ts"); + const seen = new Map(); + for (const rawDir of getSiriRequestsDirs()) { + const dir = resolve(rawDir); + if (!fs.existsSync(dir)) continue; + for (const entry of fs.readdirSync(dir, { withFileTypes: true })) { + if (!entry.isFile() || !/^[A-Za-z0-9-]{1,128}\.json$/.test(entry.name)) continue; + const requestId = entry.name.slice(0, -5); + const mtimeMs = fs.statSync(join(dir, entry.name)).mtimeMs; + if (!seen.has(requestId) || mtimeMs < (seen.get(requestId) ?? 0)) + seen.set(requestId, mtimeMs); + } + } + const requests = [...seen.entries()] + .map(([requestId, mtimeMs]) => ({ requestId, mtimeMs })) + .sort((a, b) => a.mtimeMs - b.mtimeMs); + + for (const { requestId } of requests) { + try { + const thread = await consumeSiriRequest(requestId); + if (thread) await openSiriThread(thread); + } catch (error) { + // Leave failed requests on disk so a later app activation can retry. + console.error(`[Main] Failed to consume pending Siri request ${requestId}:`, error); + } + } +} + /** * Route a `pipper://siri/` deep link (opened by the Swift * StartThreadIntent): focus the main window, consume the staged request, and @@ -540,14 +589,7 @@ async function handlePipperDeepLink(url: string): Promise { mainWindow.focus(); } const thread = await consumeSiriRequest(match[1]); - if (thread) { - const threadId = (thread as { id?: string })?.id; - if (threadId) { - const next = await openThreadTab(threadId); - broadcastOpenTabsChanged(mainWindow, next); - await requireAgentManager().switchThread(threadId); - } - } + if (thread) await openSiriThread(thread); return true; } @@ -2358,6 +2400,7 @@ app.whenReady().then(async () => { attention: { isFocused: () => mainWindowFocused }, notify: osNotifier, }); + await consumePendingSiriRequests(); for (const queued of pendingDeepLinks.splice(0)) { await handlePipperDeepLink(queued).catch((err) => { console.error("[Main] Failed to handle queued deep link:", err); @@ -2482,6 +2525,9 @@ app.whenReady().then(async () => { } app.on("activate", async () => { + await consumePendingSiriRequests().catch((err) => { + console.error("[Main] Failed to consume pending Siri requests on activation:", err); + }); const hasMain = mainWindow && !mainWindow.isDestroyed(); const hasLaunch = launchWindow && !launchWindow.isDestroyed(); if (!hasMain && !hasLaunch) { diff --git a/electron/paths.ts b/electron/paths.ts index a7bd5d3..c57891f 100644 --- a/electron/paths.ts +++ b/electron/paths.ts @@ -2,12 +2,15 @@ import { app } from "electron"; import { join } from "node:path"; import os from "node:os"; +/** Shared with the sandboxed App Intents extension on macOS. */ +export const PIPPER_APP_GROUP_IDENTIFIER = "group.com.maker-or.omni.pipper"; + /** User-owned storage that remains for launcher update artifacts and state. */ export function getPipperLibraryPath(): string { if (process.env.PIPPER_LIBRARY_PATH) return process.env.PIPPER_LIBRARY_PATH; try { return process.platform === "darwin" - ? join(os.homedir(), "Library/pipper") + ? join(os.homedir(), "Library/Group Containers", PIPPER_APP_GROUP_IDENTIFIER) : join(app.getPath("appData"), "pipper"); } catch { const home = os.homedir(); @@ -15,7 +18,7 @@ export function getPipperLibraryPath(): string { return join(process.env.APPDATA || join(home, "AppData/Roaming"), "pipper"); } return process.platform === "darwin" - ? join(home, "Library/pipper") + ? join(home, "Library/Group Containers", PIPPER_APP_GROUP_IDENTIFIER) : join(process.env.XDG_CONFIG_HOME || join(home, ".config"), "pipper"); } } diff --git a/electron/siri/siri-catalog.ts b/electron/siri/siri-catalog.ts index b05284b..89cda9a 100644 --- a/electron/siri/siri-catalog.ts +++ b/electron/siri/siri-catalog.ts @@ -1,6 +1,7 @@ import { mkdirSync, renameSync, writeFileSync } from "node:fs"; import { dirname, join } from "node:path"; -import { getPipperLibraryPath } from "../paths.ts"; +import os from "node:os"; +import { getPipperLibraryPath, PIPPER_APP_GROUP_IDENTIFIER } from "../paths.ts"; import { listProjects } from "../projects.ts"; import { listRegisteredAgents, getDefaultAgentId } from "../agents/registry.ts"; @@ -24,7 +25,17 @@ export interface SiriCatalog { agents: SiriCatalogAgent[]; } -/** Absolute path of the shared catalog both Electron and Siri read. */ +/** Every location the Swift extension may read from (App Group + legacy). */ +export function getSiriLibraryDirs(): string[] { + const dirs = [getPipperLibraryPath()]; + if (process.env.PIPPER_LIBRARY_PATH) return dirs; + if (process.platform === "darwin") { + const legacy = join(os.homedir(), "Library", "pipper"); + if (legacy !== dirs[0]) dirs.push(legacy); + void PIPPER_APP_GROUP_IDENTIFIER; + } + return [...new Set(dirs)]; +} export function getSiriCatalogPath(): string { return join(getPipperLibraryPath(), "siri-catalog.json"); } @@ -34,6 +45,11 @@ export function getSiriRequestsDir(): string { return join(getPipperLibraryPath(), "siri-requests"); } +/** All request dirs the extension may stage into (dual-write targets). */ +export function getSiriRequestsDirs(): string[] { + return getSiriLibraryDirs().map((d) => join(d, "siri-requests")); +} + /** Snapshot the current projects and agents into the shared catalog shape. */ export function buildSiriCatalog(): SiriCatalog { const projects = listProjects().map((p) => ({ @@ -61,12 +77,22 @@ export function buildSiriCatalog(): SiriCatalog { */ export function refreshSiriCatalog(): SiriCatalog { const catalog = buildSiriCatalog(); - const dir = getPipperLibraryPath(); - mkdirSync(dir, { recursive: true }); - mkdirSync(getSiriRequestsDir(), { recursive: true }); - const target = getSiriCatalogPath(); - const tmp = join(dirname(target), `.siri-catalog.${process.pid}.tmp`); - writeFileSync(tmp, JSON.stringify(catalog, null, 2), "utf8"); - renameSync(tmp, target); + const payload = JSON.stringify(catalog, null, 2); + // Dual-write so the ad-hoc-signed extension finds the catalog whether it + // resolves the App Group container or falls back to ~/Library/pipper. + for (const dir of getSiriLibraryDirs()) { + try { + mkdirSync(dir, { recursive: true }); + mkdirSync(join(dir, "siri-requests"), { recursive: true }); + const target = join(dir, "siri-catalog.json"); + const tmp = join(dirname(target), `.siri-catalog.${process.pid}.tmp`); + writeFileSync(tmp, payload, "utf8"); + renameSync(tmp, target); + } catch (err) { + // Ad-hoc-signed builds cannot create the App Group container; the + // legacy ~/Library/pipper location must still be updated. + console.warn(`[Siri] Catalog write failed for ${dir}:`, err); + } + } return catalog; } diff --git a/native/pipper-intents/Extension/AppIntentsExtension.swift b/native/pipper-intents/Extension/AppIntentsExtension.swift new file mode 100644 index 0000000..3737a53 --- /dev/null +++ b/native/pipper-intents/Extension/AppIntentsExtension.swift @@ -0,0 +1,6 @@ +import AppIntents +import ExtensionFoundation + +@main +struct PipperIntentsExtension: AppIntentsExtension { +} diff --git a/native/pipper-intents/Extension/Info.plist b/native/pipper-intents/Extension/Info.plist new file mode 100644 index 0000000..12f66a5 --- /dev/null +++ b/native/pipper-intents/Extension/Info.plist @@ -0,0 +1,25 @@ + + + + + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleDisplayName + Pipper + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + XPC! + CFBundleShortVersionString + $(MARKETING_VERSION) + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + EXAppExtensionAttributes + + EXExtensionPointIdentifier + com.apple.appintents-extension + + + diff --git a/native/pipper-intents/Extension/PipperIntents.entitlements b/native/pipper-intents/Extension/PipperIntents.entitlements new file mode 100644 index 0000000..f5d4f18 --- /dev/null +++ b/native/pipper-intents/Extension/PipperIntents.entitlements @@ -0,0 +1,16 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.application-groups + + group.com.maker-or.omni.pipper + + com.apple.security.temporary-exception.files.home-relative-path.read-write + + /Library/pipper/ + + + diff --git a/native/pipper-intents/PreviewApp/PipperIntentsPreview.entitlements b/native/pipper-intents/PreviewApp/PipperIntentsPreview.entitlements new file mode 100644 index 0000000..6631ffa --- /dev/null +++ b/native/pipper-intents/PreviewApp/PipperIntentsPreview.entitlements @@ -0,0 +1,6 @@ + + + + + + diff --git a/native/pipper-intents/PreviewApp/PipperIntentsPreview.xcodeproj/project.pbxproj b/native/pipper-intents/PreviewApp/PipperIntentsPreview.xcodeproj/project.pbxproj new file mode 100644 index 0000000..937b287 --- /dev/null +++ b/native/pipper-intents/PreviewApp/PipperIntentsPreview.xcodeproj/project.pbxproj @@ -0,0 +1,400 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 77; + objects = { + +/* Begin PBXBuildFile section */ + A10000010000000000000001 /* PipperIntentsPreviewApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = A10000020000000000000001 /* PipperIntentsPreviewApp.swift */; }; + A10000010000000000000002 /* PipperIntents.swift in Sources */ = {isa = PBXBuildFile; fileRef = A10000020000000000000002 /* PipperIntents.swift */; }; + A10000010000000000000003 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A10000020000000000000003 /* SwiftUI.framework */; }; + A10000010000000000000004 /* AppIntents.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A10000020000000000000004 /* AppIntents.framework */; }; + A10000010000000000000005 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A10000020000000000000005 /* AppKit.framework */; }; + A10000010000000000000006 /* AppIntentsExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A10000020000000000000007 /* AppIntentsExtension.swift */; }; + A10000010000000000000007 /* PipperIntents.swift in Extension Sources */ = {isa = PBXBuildFile; fileRef = A10000020000000000000002 /* PipperIntents.swift */; }; + A10000010000000000000008 /* AppIntents.framework in Extension Frameworks */ = {isa = PBXBuildFile; fileRef = A10000020000000000000004 /* AppIntents.framework */; }; + A10000010000000000000009 /* AppKit.framework in Extension Frameworks */ = {isa = PBXBuildFile; fileRef = A10000020000000000000005 /* AppKit.framework */; }; + A1000001000000000000000A /* ExtensionFoundation.framework in Extension Frameworks */ = {isa = PBXBuildFile; fileRef = A10000020000000000000009 /* ExtensionFoundation.framework */; }; + A1000001000000000000000B /* PipperIntents.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = A1000002000000000000000A /* PipperIntents.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + A100000A0000000000000001 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = A10000070000000000000001 /* Project object */; + proxyType = 1; + remoteGlobalIDString = A10000050000000000000002; + remoteInfo = PipperIntents; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXFileReference section */ + A10000020000000000000001 /* PipperIntentsPreviewApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PipperIntentsPreviewApp.swift; sourceTree = ""; }; + A10000020000000000000002 /* PipperIntents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PipperIntents.swift; path = ../Sources/PipperIntents.swift; sourceTree = ""; }; + A10000020000000000000003 /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; }; + A10000020000000000000004 /* AppIntents.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppIntents.framework; path = System/Library/Frameworks/AppIntents.framework; sourceTree = SDKROOT; }; + A10000020000000000000005 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; + A10000020000000000000006 /* PipperIntentsPreview.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PipperIntentsPreview.app; sourceTree = BUILT_PRODUCTS_DIR; }; + A10000020000000000000007 /* AppIntentsExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = AppIntentsExtension.swift; path = ../Extension/AppIntentsExtension.swift; sourceTree = ""; }; + A10000020000000000000008 /* AppIntentsExtension-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = ../Extension/Info.plist; sourceTree = ""; }; + A10000020000000000000009 /* ExtensionFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ExtensionFoundation.framework; path = System/Library/Frameworks/ExtensionFoundation.framework; sourceTree = SDKROOT; }; + A1000002000000000000000A /* PipperIntents.appex */ = {isa = PBXFileReference; explicitFileType = wrapper.app-extension; includeInIndex = 0; path = PipperIntents.appex; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + A10000030000000000000001 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + A10000010000000000000003 /* SwiftUI.framework in Frameworks */, + A10000010000000000000004 /* AppIntents.framework in Frameworks */, + A10000010000000000000005 /* AppKit.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A10000030000000000000004 /* Extension Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + A10000010000000000000008 /* AppIntents.framework in Extension Frameworks */, + A10000010000000000000009 /* AppKit.framework in Extension Frameworks */, + A1000001000000000000000A /* ExtensionFoundation.framework in Extension Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + A10000040000000000000001 = { + isa = PBXGroup; + children = ( + A10000040000000000000002 /* PreviewApp */, + A10000040000000000000003 /* Frameworks */, + A10000040000000000000004 /* Products */, + ); + sourceTree = ""; + }; + A10000040000000000000002 /* PreviewApp */ = { + isa = PBXGroup; + children = ( + A10000020000000000000001 /* PipperIntentsPreviewApp.swift */, + A10000020000000000000002 /* PipperIntents.swift */, + ); + path = .; + sourceTree = ""; + }; + A10000040000000000000005 /* Extension */ = { + isa = PBXGroup; + children = ( + A10000020000000000000007 /* AppIntentsExtension.swift */, + A10000020000000000000008 /* AppIntentsExtension-Info.plist */, + ); + path = ../Extension; + sourceTree = ""; + }; + A10000040000000000000003 /* Frameworks */ = { + isa = PBXGroup; + children = ( + A10000020000000000000003 /* SwiftUI.framework */, + A10000020000000000000004 /* AppIntents.framework */, + A10000020000000000000005 /* AppKit.framework */, + A10000020000000000000009 /* ExtensionFoundation.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + A10000040000000000000004 /* Products */ = { + isa = PBXGroup; + children = ( + A10000020000000000000006 /* PipperIntentsPreview.app */, + A1000002000000000000000A /* PipperIntents.appex */, + ); + name = Products; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + A10000050000000000000001 /* PipperIntentsPreview */ = { + isa = PBXNativeTarget; + buildConfigurationList = A10000060000000000000002 /* Build configuration list for PBXNativeTarget "PipperIntentsPreview" */; + buildPhases = ( + A10000030000000000000002 /* Sources */, + A10000030000000000000001 /* Frameworks */, + A10000030000000000000003 /* Resources */, + A10000030000000000000007 /* Embed App Extensions */, + ); + buildRules = ( + ); + dependencies = ( + A100000B0000000000000001 /* PBXTargetDependency */, + ); + name = PipperIntentsPreview; + productName = PipperIntentsPreview; + productReference = A10000020000000000000006 /* PipperIntentsPreview.app */; + productType = "com.apple.product-type.application"; + }; + A10000050000000000000002 /* PipperIntents */ = { + isa = PBXNativeTarget; + buildConfigurationList = A10000060000000000000003 /* Build configuration list for PBXNativeTarget "PipperIntents" */; + buildPhases = ( + A10000030000000000000005 /* Extension Sources */, + A10000030000000000000004 /* Extension Frameworks */, + A10000030000000000000006 /* Extension Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = PipperIntents; + productName = PipperIntents; + productReference = A1000002000000000000000A /* PipperIntents.appex */; + productType = "com.apple.product-type.extensionkit-extension"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + A10000070000000000000001 /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = 1; + LastUpgradeCheck = 2700; + TargetAttributes = { + A10000050000000000000001 = { + CreatedOnToolsVersion = 27.0; + }; + A10000050000000000000002 = { + CreatedOnToolsVersion = 27.0; + }; + }; + }; + buildConfigurationList = A10000060000000000000001 /* Build configuration list for PBXProject "PipperIntentsPreview" */; + compatibilityVersion = "Xcode 16.0"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = A10000040000000000000001; + productRefGroup = A10000040000000000000004 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + A10000050000000000000001 /* PipperIntentsPreview */, + A10000050000000000000002 /* PipperIntents */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + A10000030000000000000003 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A10000030000000000000006 /* Extension Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXCopyFilesBuildPhase section */ + A10000030000000000000007 /* Embed App Extensions */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = "$(EXTENSIONS_FOLDER_PATH)"; + dstSubfolderSpec = 16; + files = ( + A1000001000000000000000B /* PipperIntents.appex in Embed App Extensions */, + ); + name = "Embed App Extensions"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + A10000030000000000000002 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A10000010000000000000001 /* PipperIntentsPreviewApp.swift in Sources */, + A10000010000000000000002 /* PipperIntents.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + A10000030000000000000005 /* Extension Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + A10000010000000000000006 /* AppIntentsExtension.swift in Sources */, + A10000010000000000000007 /* PipperIntents.swift in Extension Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + A100000B0000000000000001 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = A10000050000000000000002 /* PipperIntents */; + targetProxy = A100000A0000000000000001 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin XCBuildConfiguration section */ + A10000080000000000000001 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + APP_SHORTCUTS_ENABLE_FLEXIBLE_MATCHING = YES; + CLANG_ENABLE_MODULES = YES; + CODE_SIGNING_ALLOWED = YES; + CODE_SIGNING_REQUIRED = NO; + CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_ENTITLEMENTS = PipperIntentsPreview.entitlements; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = ""; + ENABLE_HARDENED_RUNTIME = YES; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_CFBundleDisplayName = Pipper; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity"; + MACOSX_DEPLOYMENT_TARGET = 13.0; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = dev.pipper.PipperIntentsPreview; + PRODUCT_NAME = PipperIntentsPreview; + SDKROOT = macosx; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = apple-generic; + }; + name = Debug; + }; + A10000080000000000000002 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + APP_SHORTCUTS_ENABLE_FLEXIBLE_MATCHING = YES; + CLANG_ENABLE_MODULES = YES; + CODE_SIGNING_ALLOWED = YES; + CODE_SIGNING_REQUIRED = NO; + CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_ENTITLEMENTS = PipperIntentsPreview.entitlements; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = ""; + ENABLE_HARDENED_RUNTIME = YES; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_CFBundleDisplayName = Pipper; + INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity"; + MACOSX_DEPLOYMENT_TARGET = 13.0; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = dev.pipper.PipperIntentsPreview; + PRODUCT_NAME = PipperIntentsPreview; + SDKROOT = macosx; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = apple-generic; + }; + name = Release; + }; + A10000080000000000000003 /* Debug target */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + A10000080000000000000004 /* Release target */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; + A10000080000000000000005 /* Debug extension */ = { + isa = XCBuildConfiguration; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_ENABLE_MODULES = YES; + CODE_SIGNING_ALLOWED = YES; + CODE_SIGNING_REQUIRED = NO; + CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_ENTITLEMENTS = PipperIntentsPreviewExtension.entitlements; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = ""; + ENABLE_HARDENED_RUNTIME = YES; + GENERATE_INFOPLIST_FILE = NO; + INFOPLIST_FILE = ../Extension/Info.plist; + MACOSX_DEPLOYMENT_TARGET = 13.0; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = dev.pipper.PipperIntentsPreview.PipperIntents; + PRODUCT_NAME = PipperIntents; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SWIFT_VERSION = 5.0; + }; + name = Debug; + }; + A10000080000000000000006 /* Release extension */ = { + isa = XCBuildConfiguration; + buildSettings = { + APPLICATION_EXTENSION_API_ONLY = YES; + CLANG_ENABLE_MODULES = YES; + CODE_SIGNING_ALLOWED = YES; + CODE_SIGNING_REQUIRED = NO; + CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_ENTITLEMENTS = PipperIntentsPreviewExtension.entitlements; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = ""; + ENABLE_HARDENED_RUNTIME = YES; + GENERATE_INFOPLIST_FILE = NO; + INFOPLIST_FILE = ../Extension/Info.plist; + MACOSX_DEPLOYMENT_TARGET = 13.0; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = dev.pipper.PipperIntentsPreview.PipperIntents; + PRODUCT_NAME = PipperIntents; + SDKROOT = macosx; + SKIP_INSTALL = YES; + SWIFT_VERSION = 5.0; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + A10000060000000000000001 /* Build configuration list for PBXProject "PipperIntentsPreview" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A10000080000000000000001 /* Debug */, + A10000080000000000000002 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + A10000060000000000000002 /* Build configuration list for PBXNativeTarget "PipperIntentsPreview" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A10000080000000000000003 /* Debug target */, + A10000080000000000000004 /* Release target */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + A10000060000000000000003 /* Build configuration list for PBXNativeTarget "PipperIntents" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + A10000080000000000000005 /* Debug extension */, + A10000080000000000000006 /* Release extension */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = A10000070000000000000001 /* Project object */; +} diff --git a/native/pipper-intents/PreviewApp/PipperIntentsPreview.xcodeproj/xcshareddata/xcschemes/PipperIntentsPreview.xcscheme b/native/pipper-intents/PreviewApp/PipperIntentsPreview.xcodeproj/xcshareddata/xcschemes/PipperIntentsPreview.xcscheme new file mode 100644 index 0000000..58e62d4 --- /dev/null +++ b/native/pipper-intents/PreviewApp/PipperIntentsPreview.xcodeproj/xcshareddata/xcschemes/PipperIntentsPreview.xcscheme @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/native/pipper-intents/PreviewApp/PipperIntentsPreviewApp.swift b/native/pipper-intents/PreviewApp/PipperIntentsPreviewApp.swift new file mode 100644 index 0000000..54e0d08 --- /dev/null +++ b/native/pipper-intents/PreviewApp/PipperIntentsPreviewApp.swift @@ -0,0 +1,19 @@ +import SwiftUI + +/// Minimal macOS host used to make the package's App Shortcuts visible to +/// Xcode's Product > App Shortcuts Preview. +@main +struct PipperIntentsPreviewApp: App { + var body: some Scene { + WindowGroup("Pipper App Shortcuts Preview") { + VStack(spacing: 12) { + Text("Pipper App Shortcuts") + .font(.title2) + Text("Build this host, then open Product > App Shortcuts Preview.") + .foregroundStyle(.secondary) + } + .padding(32) + .frame(minWidth: 420, minHeight: 180) + } + } +} diff --git a/native/pipper-intents/PreviewApp/PipperIntentsPreviewExtension.entitlements b/native/pipper-intents/PreviewApp/PipperIntentsPreviewExtension.entitlements new file mode 100644 index 0000000..852fa1a --- /dev/null +++ b/native/pipper-intents/PreviewApp/PipperIntentsPreviewExtension.entitlements @@ -0,0 +1,8 @@ + + + + + com.apple.security.app-sandbox + + + diff --git a/native/pipper-intents/README.md b/native/pipper-intents/README.md index 32191a9..4a16a32 100644 --- a/native/pipper-intents/README.md +++ b/native/pipper-intents/README.md @@ -1,19 +1,45 @@ # PipperIntents (Siri / Shortcuts) Swift Package providing the Siri entry point for Pipper: `StartThreadIntent` -plus `ProjectEntity` / `AgentEntity` backed by the shared catalog at -`~/Library/pipper/siri-catalog.json` (written by Electron, see +plus `ProjectEntity` / `AgentEntity` backed by the shared App Group catalog in +`group.com.maker-or.omni.pipper` (written by Electron, see `electron/siri/siri-catalog.ts`). -Flow: intent stages `~/Library/pipper/siri-requests/.json`, then opens -`pipper://siri/`. Electron handles the deep link (`handlePipperDeepLink` -in `electron/main.ts`), creates the thread, delivers the prompt, and lands on -it. Confirm-then-create: nothing is created until the user confirms. +Flow: the intent stages a request in +`~/Library/Group Containers/group.com.maker-or.omni.pipper/siri-requests/.json` +and asks macOS to open Pipper. Electron consumes the pending request during +startup or activation, creates the thread, delivers the prompt, and lands on +it. The App Group is required because macOS runs App Intents extensions in the +App Sandbox. -## Known limitation: bundle packaging +## Packaging -`swift build` here only validates compilation. For Siri/Shortcuts to discover -`PipperShortcuts`, these types must be compiled into the shipped `.app` bundle -via a real Xcode app/extension target (which emits `Metadata.appintents`). -That host target + `electron-builder` `extraFiles` wiring is a tracked -follow-up; until then the intent cannot be tested end-to-end in Siri. +`swift build` here only validates compilation. The packaged macOS app is built +with the `PipperIntents` Xcode extension target, which emits +`Metadata.appintents`; `scripts/build.js` builds it automatically before +`electron-builder` embeds it in the app. + +## App Shortcuts Preview host + +The minimal `PreviewApp/PipperIntentsPreview.xcodeproj` host reuses +`Sources/PipperIntents.swift` directly and exists only to generate an app +bundle for inspecting the App Intents metadata. Open the project with Xcode 27 +beta, select the `PipperIntentsPreview` scheme, and build it once. The preview +extension uses a unique bundle identifier and supplies one Demo Project and +Preview Agent when no Electron catalog is present. + +Important: Apple does not support App Shortcuts or flexible phrase matching on +macOS. The Mac target will therefore show `No Flexible Matching Assets` in +Product > App Shortcuts Preview. The generated metadata still verifies that +the intent and its exact registered phrases are present. On macOS, the intent +is available as an action in the Shortcuts app instead. + +The registered phrases are: + +- `Start a thread in Pipper` +- `New thread in Pipper` +- `Start a thread with Pipper` + +The App Intents extension target in this project is embedded into the packaged +Electron app by `electron-builder.yml`. The preview app target remains useful +for inspecting metadata independently. diff --git a/native/pipper-intents/Sources/PipperIntents.swift b/native/pipper-intents/Sources/PipperIntents.swift index 4a24bac..4336554 100644 --- a/native/pipper-intents/Sources/PipperIntents.swift +++ b/native/pipper-intents/Sources/PipperIntents.swift @@ -1,5 +1,4 @@ import AppIntents -import AppKit import Foundation // MARK: - Shared catalog (written by Electron, read by Siri) @@ -25,16 +24,43 @@ struct SiriCatalog: Codable, Sendable { } enum SiriCatalogStore { + /// App Intents extensions must run in the App Sandbox. The containing + /// Electron app and this extension share the catalog through this group. + static let appGroupIdentifier = "group.com.maker-or.omni.pipper" + + /// The Xcode preview host has no Electron process to populate the live + /// catalog. Keep its metadata/action preview useful without exposing these + /// sample entities in the packaged app. + static var isPreviewExtension: Bool { + Bundle.main.bundleIdentifier?.hasPrefix("dev.pipper.PipperIntentsPreview") == true + } + /// Base directory shared with Electron. Honors the same PIPPER_LIBRARY_PATH - /// override so both sides never diverge. - static func baseDir() -> URL { + /// override so both sides never diverge. Ad-hoc-signed production builds + /// cannot resolve the App Group container, so fall back to ~/Library/pipper + /// (covered by the temporary-exception entitlement) and probe both. + static func candidateDirs() -> [URL] { if let overridePath = ProcessInfo.processInfo.environment["PIPPER_LIBRARY_PATH"], !overridePath.isEmpty { - return URL(fileURLWithPath: overridePath, isDirectory: true) + return [URL(fileURLWithPath: overridePath, isDirectory: true)] + } + var dirs: [URL] = [] + if let groupURL = FileManager.default.containerURL( + forSecurityApplicationGroupIdentifier: appGroupIdentifier + ) { + dirs.append(groupURL) } - return FileManager.default.homeDirectoryForCurrentUser - .appendingPathComponent("Library/pipper", isDirectory: true) + dirs.append( + FileManager.default.homeDirectoryForCurrentUser + .appendingPathComponent("Library/pipper", isDirectory: true)) + // Deduplicate while preserving order. + var seen = Set() + return dirs.filter { seen.insert($0.path).inserted } + } + + static func baseDir() -> URL { + candidateDirs()[0] } static func catalogURL() -> URL { @@ -46,8 +72,34 @@ enum SiriCatalogStore { } static func load() -> SiriCatalog? { - guard let data = try? Data(contentsOf: catalogURL()) else { return nil } - return try? JSONDecoder().decode(SiriCatalog.self, from: data) + for dir in candidateDirs() { + let url = dir.appendingPathComponent("siri-catalog.json") + if let data = try? Data(contentsOf: url), + let catalog = try? JSONDecoder().decode(SiriCatalog.self, from: data) + { + return catalog + } + } + guard isPreviewExtension else { return nil } + return SiriCatalog( + version: 1, + updatedAt: "preview", + defaultAgentId: "preview-agent", + projects: [ + SiriCatalogProject( + id: "preview-project", + name: "Demo Project", + path: "/tmp/pipper-preview-project" + ) + ], + agents: [ + SiriCatalogAgent( + id: "preview-agent", + displayName: "Preview Agent", + available: true + ) + ] + ) } } @@ -139,7 +191,6 @@ enum SiriRequestError: Error, CustomLocalizedStringResourceConvertible { case encodingFailed case stagingFailed case agentUnavailable(String) - case openFailed var localizedStringResource: LocalizedStringResource { switch self { @@ -147,7 +198,6 @@ enum SiriRequestError: Error, CustomLocalizedStringResourceConvertible { case .stagingFailed: return "Couldn't save the thread request. Please try again." case .agentUnavailable(let name): return "The agent \(name) isn't available. Pick an installed agent." - case .openFailed: return "Couldn't open Pipper to create the thread." } } } @@ -160,7 +210,10 @@ struct StartThreadIntent: AppIntent { "Starts a new thread in a Pipper project with a chosen agent.", categoryName: "Productivity" ) - static var openAppWhenRun: Bool = false + // App Intents extensions cannot use NSWorkspace to launch their containing + // app. macOS opens the host app after perform() returns when this is true; + // Electron then consumes the staged request during activation/startup. + static var openAppWhenRun: Bool = true @Parameter(title: "Project") var project: ProjectEntity @Parameter(title: "Agent") var agent: AgentEntity? @@ -181,8 +234,13 @@ struct StartThreadIntent: AppIntent { } else { resolvedAgentId = defaultId.flatMap { usableIds.contains($0) ? $0 : nil } } - // Confirm-then-create: stage a pending request, then open Pipper on the - // deep link so Electron consumes it and lands on the new thread. + if SiriCatalogStore.isPreviewExtension { + return .result( + dialog: "Preview: would start a thread in \(project.name)." + ) + } + // Stage a pending request. The host app is opened automatically after the + // intent completes and Electron consumes this file during activation. let requestId = UUID().uuidString let payload: [String: String] = [ "requestId": requestId, @@ -190,26 +248,35 @@ struct StartThreadIntent: AppIntent { "agentId": resolvedAgentId ?? "", "prompt": prompt ?? "", ] - let dir = SiriCatalogStore.requestsDir() - do { - try FileManager.default.createDirectory(at: dir, withIntermediateDirectories: true) - let url = dir.appendingPathComponent("\(requestId).json") - guard let data = try? JSONSerialization.data(withJSONObject: payload) else { - throw SiriRequestError.encodingFailed + let dir = SiriCatalogStore.baseDir().appendingPathComponent("siri-requests", isDirectory: true) + // Stage into every candidate dir so Electron finds the request no + // matter which location it consumes from. One location failing (e.g. + //Sandbox denying the group container) must not fail the whole intent. + var stagedCount = 0 + var lastError: Error? + for base in SiriCatalogStore.candidateDirs() { + do { + let target = base.appendingPathComponent("siri-requests", isDirectory: true) + try FileManager.default.createDirectory(at: target, withIntermediateDirectories: true) + let url = target.appendingPathComponent("\(requestId).json") + guard let data = try? JSONSerialization.data(withJSONObject: payload) else { + throw SiriRequestError.encodingFailed + } + try data.write(to: url, options: .atomic) + stagedCount += 1 + } catch { + lastError = error } - try data.write(to: url, options: .atomic) - } catch let error as SiriRequestError { - throw error - } catch { - throw SiriRequestError.stagingFailed } - guard let deepLink = URL(string: "pipper://siri/\(requestId)"), - NSWorkspace.shared.open(deepLink) - else { - throw SiriRequestError.openFailed + _ = dir + if stagedCount == 0 { + if let siriError = lastError as? SiriRequestError { + throw siriError + } + throw SiriRequestError.stagingFailed } return .result( - dialog: "Starting a thread in \(project.name). Confirm in Pipper to create it." + dialog: "Starting a thread in \(project.name)." ) } } diff --git a/scripts/after-pack.js b/scripts/after-pack.js new file mode 100644 index 0000000..52e75a3 --- /dev/null +++ b/scripts/after-pack.js @@ -0,0 +1,34 @@ +import { spawnSync } from "node:child_process"; +import { existsSync } from "node:fs"; +import { join } from "node:path"; + +/** + * App Intents extensions contain generated Metadata.appintents resources. + * Sign the nested extension after electron-builder copies extraFiles and + * before it signs the containing app, so the parent resource seal is valid. + */ +export default function afterPack(context) { + if (context.electronPlatformName !== "darwin") return; + + const appPath = join(context.appOutDir, `${context.packager.appInfo.productFilename}.app`); + const extensionPath = join(appPath, "Contents", "Extensions", "PipperIntents.appex"); + if (!existsSync(extensionPath)) return; + + const result = spawnSync( + "codesign", + [ + "--force", + "--sign", + "-", + "--timestamp=none", + "--entitlements", + "native/pipper-intents/Extension/PipperIntents.entitlements", + extensionPath, + ], + { cwd: context.packager.projectDir, stdio: "inherit" }, + ); + if (result.error) throw result.error; + if (result.status !== 0) { + throw new Error(`codesign failed for PipperIntents.appex with exit code ${result.status}`); + } +} diff --git a/scripts/build.js b/scripts/build.js index 1a897a4..432aca1 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -2,6 +2,7 @@ import { spawnSync } from "node:child_process"; import { existsSync, mkdirSync } from "node:fs"; import { join } from "node:path"; import { fileURLToPath } from "node:url"; +import os from "node:os"; const root = fileURLToPath(new URL("..", import.meta.url)); @@ -69,17 +70,45 @@ function buildMacSleeplessHelpers() { function buildPipperIntents() { if (process.platform !== "darwin") return; const intentsDir = join(root, "native", "pipper-intents"); - if (!existsSync(join(intentsDir, "Package.swift"))) return; - const result = spawnSync("swift", ["build", "--disable-sandbox"], { - cwd: intentsDir, - stdio: "inherit", - }); + const project = join(intentsDir, "PreviewApp", "PipperIntentsPreview.xcodeproj"); + if (!existsSync(project)) return; + const output = join(intentsDir, "dist"); + mkdirSync(output, { recursive: true }); + const developerCandidates = [ + join(os.homedir(), "Downloads", "Xcode-beta.app", "Contents", "Developer"), + "/Applications/Xcode-beta.app/Contents/Developer", + ]; + const developerDir = developerCandidates.find((candidate) => existsSync(candidate)); + const env = developerDir ? { ...process.env, DEVELOPER_DIR: developerDir } : process.env; + const result = spawnSync( + "xcodebuild", + [ + "-project", + project, + "-target", + "PipperIntents", + "-configuration", + "Release", + `CONFIGURATION_BUILD_DIR=${output}`, + "PRODUCT_BUNDLE_IDENTIFIER=com.maker-or.omni.PipperIntents", + "CODE_SIGNING_ALLOWED=NO", + "build", + ], + { + cwd: root, + env, + stdio: "inherit", + }, + ); if (result.error) { - console.warn("[build] swift not available, skipping PipperIntents:", result.error.message); - return; + throw new Error(`[build] xcodebuild is required for PipperIntents: ${result.error.message}`); } if (result.status !== 0) { - throw new Error(`[build] PipperIntents swift build failed with exit code ${result.status}`); + throw new Error(`[build] PipperIntents extension build failed with exit code ${result.status}`); + } + const extension = join(output, "PipperIntents.appex"); + if (!existsSync(extension)) { + throw new Error(`[build] PipperIntents extension build did not produce ${extension}`); } } From 3737b4a076eef19b08b6705e9bc96fa46293ecaa Mon Sep 17 00:00:00 2001 From: Harshith Pasupuleti Date: Tue, 8 Sep 2026 08:45:36 +0530 Subject: [PATCH 09/22] Clarify download setup instructions --- marketing/src/pages/download.astro | 62 ++++++++++++++++++++++++++---- 1 file changed, 55 insertions(+), 7 deletions(-) diff --git a/marketing/src/pages/download.astro b/marketing/src/pages/download.astro index a85238b..3c8be68 100644 --- a/marketing/src/pages/download.astro +++ b/marketing/src/pages/download.astro @@ -41,6 +41,11 @@ const windowsLauncherManifestUrl = "/api/launcher/latest-windows.json"; > Download pipper code +

+ One-time setup before first launch. +

@@ -65,18 +70,46 @@ const windowsLauncherManifestUrl = "/api/launcher/latest-windows.json"; aria-label="Unsigned macOS and Windows launch notes" >

- macOS note: Make sure that you - have mise installed, then run the following command in the terminal: + macOS setup — complete these steps first +
    +
  1. + 1 + Download the app below. +
    2. +
  2. + 2 + Move Pipper Code (Alpha).app to Applications. +
    3. +
  3. + 3 + Open Terminal. +
    4. +
  4. + 4 + Run this command (before opening the app): +
    5. +
xattr -cr "/Applications/Pipper Code (Alpha).app"
- Windows note: This build is unsigned. - If SmartScreen warns you, choose More info and then - Run anyway, or right-click the installer and choose - Run as administrator if installation is blocked. + Windows setup +
    +
  1. + 1 + Download the installer below. +
    2. +
  2. + 2 + Install and open pipper code. +
    3. +
  3. + 3 + For SmartScreen, choose More info → Run anyway. +
    4. +
@@ -252,6 +285,21 @@ const windowsLauncherManifestUrl = "/api/launcher/latest-windows.json"; color: var(--download-ink); } + .download-step-number { + display: inline-flex; + flex: 0 0 1.35rem; + width: 1.35rem; + height: 1.35rem; + align-items: center; + justify-content: center; + margin-top: 0.05rem; + border: 1px solid var(--download-blue); + color: var(--download-blue); + font-size: 0.72rem; + font-weight: 650; + line-height: 1; + } + .download-platforms { display: grid !important; grid-template-columns: repeat(auto-fit, minmax(min(100%, 20rem), 1fr)); From ba5a9f28b492e4f4e23d92a8f07985b1c0339263 Mon Sep 17 00:00:00 2001 From: Harshith Pasupuleti Date: Tue, 8 Sep 2026 10:20:02 +0530 Subject: [PATCH 10/22] Address review-bot findings: Siri single-flight, fallback dirs, newest-first, launcher migration, SmartScreen order, CI credentials --- .github/workflows/react-doctor.yml | 1 + electron/main.ts | 74 ++++++++++++++++++++++++++---- marketing/src/pages/download.astro | 4 +- 3 files changed, 69 insertions(+), 10 deletions(-) diff --git a/.github/workflows/react-doctor.yml b/.github/workflows/react-doctor.yml index f0a25ee..b96cedd 100644 --- a/.github/workflows/react-doctor.yml +++ b/.github/workflows/react-doctor.yml @@ -34,6 +34,7 @@ jobs: # crashes before producing a report. - uses: actions/checkout@v5 with: + persist-credentials: false # Full history so the action can diff against the merge base and # report only PR-introduced issues instead of every pre-existing one. fetch-depth: 0 diff --git a/electron/main.ts b/electron/main.ts index 0d18df7..99c8f16 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -447,6 +447,12 @@ function requireAgentManager(): AgentManager { */ const pendingDeepLinks: string[] = []; +/** + * Single-flight guard: concurrent deliveries of the same staged request + * (startup scan, activation, deep link, renderer, IPC) share one promise. + */ +const inFlightSiriRequests = new Map>(); + /** * Consume a Siri-staged thread request: validate, create the thread (once — * a `.done-.json` marker records the created thread so retries never @@ -458,12 +464,33 @@ async function consumeSiriRequest(requestId: string): Promise { if (typeof requestId !== "string" || !/^[A-Za-z0-9-]{1,128}$/.test(requestId)) { return null; } - const { getSiriRequestsDir } = await import("./siri/siri-catalog.ts"); - const dir = resolve(getSiriRequestsDir()); - const file = resolve(join(dir, `${requestId}.json`)); - const rel = relative(dir, file); - if (rel === "" || rel.startsWith("..") || isAbsolute(rel)) return null; - if (!fs.existsSync(file)) return null; + const existing = inFlightSiriRequests.get(requestId); + if (existing) return existing; + const task = consumeSiriRequestInner(requestId).finally(() => { + if (inFlightSiriRequests.get(requestId) === task) inFlightSiriRequests.delete(requestId); + }); + inFlightSiriRequests.set(requestId, task); + return task; +} + +async function consumeSiriRequestInner(requestId: string): Promise { + const { getSiriRequestsDir, getSiriRequestsDirs } = await import("./siri/siri-catalog.ts"); + // Resolve the request from every supported directory so legacy-only + // staged requests are delivered, not orphaned. + let dir = resolve(getSiriRequestsDir()); + let file: string | null = null; + for (const rawDir of getSiriRequestsDirs()) { + const candidateDir = resolve(rawDir); + const candidate = resolve(join(candidateDir, `${requestId}.json`)); + const rel = relative(candidateDir, candidate); + if (rel === "" || rel.startsWith("..") || isAbsolute(rel)) continue; + if (fs.existsSync(candidate)) { + dir = candidateDir; + file = candidate; + break; + } + } + if (!file) return null; const raw = fs.readFileSync(file, "utf8"); let parsed: { projectId: string; agentId?: string; prompt?: string }; try { @@ -510,6 +537,18 @@ async function consumeSiriRequest(requestId: string): Promise { await manager.sendPrompt({ threadId, message: parsed.prompt }); } fs.rmSync(file, { force: true }); + // Remove stale replicas in other dirs only after full success. + const { getSiriRequestsDirs: getDirs } = await import("./siri/siri-catalog.ts"); + for (const rawDir of getDirs()) { + const otherDir = resolve(rawDir); + if (otherDir === dir) continue; + try { + fs.rmSync(resolve(join(otherDir, `${requestId}.json`)), { force: true }); + fs.rmSync(resolve(join(otherDir, `.done-${requestId}.json`)), { force: true }); + } catch { + // Best-effort replica cleanup. + } + } if (threadId) fs.rmSync(markerFile, { force: true }); return thread; } @@ -544,7 +583,7 @@ async function consumePendingSiriRequests(): Promise { if (!entry.isFile() || !/^[A-Za-z0-9-]{1,128}\.json$/.test(entry.name)) continue; const requestId = entry.name.slice(0, -5); const mtimeMs = fs.statSync(join(dir, entry.name)).mtimeMs; - if (!seen.has(requestId) || mtimeMs < (seen.get(requestId) ?? 0)) + if (!seen.has(requestId) || mtimeMs > (seen.get(requestId) ?? 0)) seen.set(requestId, mtimeMs); } } @@ -2485,10 +2524,29 @@ app.whenReady().then(async () => { (process.env.PIPPER_ENABLE_LAUNCHER_UPDATES_IN_DEV === "1" && launcherManifestUrl != null); if (!launcherManifestUrl) console.info("[LauncherUpdate] Disabled: manifest URL is not configured."); + // One-time migration: previous releases stored launcher-update state + // under ~/Library/pipper; the App Group relocation must reuse it instead + // of stranding completed downloads. + let launcherRoot = join(getPipperLibraryPath(), "launcher-updates"); + if (process.platform === "darwin" && !process.env.PIPPER_LIBRARY_PATH) { + try { + const legacyRoot = join(os.homedir(), "Library", "pipper", "launcher-updates"); + if ( + legacyRoot !== launcherRoot && + fs.existsSync(legacyRoot) && + !fs.existsSync(join(launcherRoot, "state.json")) + ) { + fs.mkdirSync(launcherRoot, { recursive: true }); + fs.cpSync(legacyRoot, launcherRoot, { recursive: true, force: false }); + } + } catch (err) { + console.warn("[LauncherUpdate] Legacy migration failed:", err); + } + } launcherUpdateManager = new LauncherUpdateManager({ currentVersion: app.getVersion(), manifestUrl: launcherManifestUrl, - rootPath: join(getPipperLibraryPath(), "launcher-updates"), + rootPath: launcherRoot, enabled: launcherUpdatesEnabled, broadcastState: (state) => broadcastToWindows("launcher-update:stateChanged", state), broadcastProgress: (progress) => broadcastToWindows("launcher-update:progress", progress), diff --git a/marketing/src/pages/download.astro b/marketing/src/pages/download.astro index 3c8be68..9936169 100644 --- a/marketing/src/pages/download.astro +++ b/marketing/src/pages/download.astro @@ -103,11 +103,11 @@ const windowsLauncherManifestUrl = "/api/launcher/latest-windows.json";
  • 2 - Install and open pipper code. + Run the installer. If SmartScreen appears, choose More info → Run anyway.
  • 3 - For SmartScreen, choose More info → Run anyway. + Open pipper code.
    • From 947d3b050f10901e9a9a9ea21ffc676f3308df49 Mon Sep 17 00:00:00 2001 From: Harshith Pasupuleti Date: Wed, 9 Sep 2026 22:19:30 +0530 Subject: [PATCH 11/22] Complete PipperIntents Siri integration --- electron/paths.ts | 23 ++-- electron/siri/siri-catalog.ts | 9 +- .../Extension/PipperIntents.entitlements | 5 +- native/pipper-intents/Package.swift | 1 + .../Sources/PipperIntents.swift | 80 +++++++++--- .../PipperIntentsTests.swift | 118 ++++++++++++++++++ scripts/build.js | 5 +- 7 files changed, 201 insertions(+), 40 deletions(-) create mode 100644 native/pipper-intents/Tests/PipperIntentsTests/PipperIntentsTests.swift diff --git a/electron/paths.ts b/electron/paths.ts index c57891f..09007d6 100644 --- a/electron/paths.ts +++ b/electron/paths.ts @@ -5,20 +5,15 @@ import os from "node:os"; /** Shared with the sandboxed App Intents extension on macOS. */ export const PIPPER_APP_GROUP_IDENTIFIER = "group.com.maker-or.omni.pipper"; +/** Primary user-owned storage (ad-hoc-friendly, no Team ID required). */ +export function getPipperSharedPath(): string { + if (process.env.PIPPER_LIBRARY_PATH) return process.env.PIPPER_LIBRARY_PATH; + return process.platform === "darwin" + ? join(os.homedir(), "Library", "pipper") + : join(app.getPath("appData"), "pipper"); +} + /** User-owned storage that remains for launcher update artifacts and state. */ export function getPipperLibraryPath(): string { - if (process.env.PIPPER_LIBRARY_PATH) return process.env.PIPPER_LIBRARY_PATH; - try { - return process.platform === "darwin" - ? join(os.homedir(), "Library/Group Containers", PIPPER_APP_GROUP_IDENTIFIER) - : join(app.getPath("appData"), "pipper"); - } catch { - const home = os.homedir(); - if (process.platform === "win32") { - return join(process.env.APPDATA || join(home, "AppData/Roaming"), "pipper"); - } - return process.platform === "darwin" - ? join(home, "Library/Group Containers", PIPPER_APP_GROUP_IDENTIFIER) - : join(process.env.XDG_CONFIG_HOME || join(home, ".config"), "pipper"); - } + return getPipperSharedPath(); } diff --git a/electron/siri/siri-catalog.ts b/electron/siri/siri-catalog.ts index 89cda9a..6ed0bce 100644 --- a/electron/siri/siri-catalog.ts +++ b/electron/siri/siri-catalog.ts @@ -25,14 +25,17 @@ export interface SiriCatalog { agents: SiriCatalogAgent[]; } -/** Every location the Swift extension may read from (App Group + legacy). */ +/** Every location the Swift extension may read from (ad-hoc: ~/Library/pipper). */ export function getSiriLibraryDirs(): string[] { const dirs = [getPipperLibraryPath()]; if (process.env.PIPPER_LIBRARY_PATH) return dirs; + // Legacy Group Container fallback for users migrating from signed builds if (process.platform === "darwin") { - const legacy = join(os.homedir(), "Library", "pipper"); + const legacy = join(os.homedir(), "Library/Group Containers", PIPPER_APP_GROUP_IDENTIFIER); if (legacy !== dirs[0]) dirs.push(legacy); - void PIPPER_APP_GROUP_IDENTIFIER; + // Also probe Application Support/Pipper for future share + const appSupport = join(os.homedir(), "Library/Application Support/Pipper"); + if (appSupport !== dirs[0]) dirs.push(appSupport); } return [...new Set(dirs)]; } diff --git a/native/pipper-intents/Extension/PipperIntents.entitlements b/native/pipper-intents/Extension/PipperIntents.entitlements index f5d4f18..c2a8ef4 100644 --- a/native/pipper-intents/Extension/PipperIntents.entitlements +++ b/native/pipper-intents/Extension/PipperIntents.entitlements @@ -4,13 +4,10 @@ com.apple.security.app-sandbox - com.apple.security.application-groups - - group.com.maker-or.omni.pipper - com.apple.security.temporary-exception.files.home-relative-path.read-write /Library/pipper/ + /Library/Application Support/Pipper/ diff --git a/native/pipper-intents/Package.swift b/native/pipper-intents/Package.swift index 20f0815..f5723f0 100644 --- a/native/pipper-intents/Package.swift +++ b/native/pipper-intents/Package.swift @@ -9,5 +9,6 @@ let package = Package( ], targets: [ .target(name: "PipperIntents", path: "Sources"), + .testTarget(name: "PipperIntentsTests", dependencies: ["PipperIntents"], path: "Tests/PipperIntentsTests"), ] ) diff --git a/native/pipper-intents/Sources/PipperIntents.swift b/native/pipper-intents/Sources/PipperIntents.swift index 4336554..d3f15d2 100644 --- a/native/pipper-intents/Sources/PipperIntents.swift +++ b/native/pipper-intents/Sources/PipperIntents.swift @@ -35,25 +35,36 @@ enum SiriCatalogStore { Bundle.main.bundleIdentifier?.hasPrefix("dev.pipper.PipperIntentsPreview") == true } - /// Base directory shared with Electron. Honors the same PIPPER_LIBRARY_PATH - /// override so both sides never diverge. Ad-hoc-signed production builds - /// cannot resolve the App Group container, so fall back to ~/Library/pipper - /// (covered by the temporary-exception entitlement) and probe both. + /// Real user home. homeDirectoryForCurrentUser returns the sandbox + /// container inside an App Intents extension, not /Users/. + static func realHomeDirectory() -> URL { + if let pw = getpwuid(getuid()), let dir = pw.pointee.pw_dir { + let path = String(cString: dir) + if !path.isEmpty { return URL(fileURLWithPath: path, isDirectory: true) } + } + return FileManager.default.homeDirectoryForCurrentUser + } + + /// Ad-hoc builds have no Team ID, so App Group containers are denied. + /// Primary is ~/Library/pipper (temporary-exception), with Group Container + /// as legacy fallback for users migrating from signed builds. static func candidateDirs() -> [URL] { if let overridePath = ProcessInfo.processInfo.environment["PIPPER_LIBRARY_PATH"], !overridePath.isEmpty { return [URL(fileURLWithPath: overridePath, isDirectory: true)] } + let home = realHomeDirectory() var dirs: [URL] = [] + dirs.append( + home.appendingPathComponent("Library/pipper", isDirectory: true)) + dirs.append( + home.appendingPathComponent("Library/Application Support/Pipper", isDirectory: true)) if let groupURL = FileManager.default.containerURL( forSecurityApplicationGroupIdentifier: appGroupIdentifier ) { dirs.append(groupURL) } - dirs.append( - FileManager.default.homeDirectoryForCurrentUser - .appendingPathComponent("Library/pipper", isDirectory: true)) // Deduplicate while preserving order. var seen = Set() return dirs.filter { seen.insert($0.path).inserted } @@ -105,10 +116,10 @@ enum SiriCatalogStore { // MARK: - Entities (both dynamic -> AppEntity, not AppEnum) -struct ProjectEntity: AppEntity { +struct ProjectEntity: AppEntity, Sendable { var id: String - var name: String - var path: String + @Property(title: "Name") var name: String + @Property(title: "Path") var path: String static var typeDisplayRepresentation: TypeDisplayRepresentation = "Project" static var defaultQuery = ProjectEntityQuery() @@ -116,6 +127,12 @@ struct ProjectEntity: AppEntity { var displayRepresentation: DisplayRepresentation { DisplayRepresentation(title: "\(name)", subtitle: "\(path)") } + + init(id: String, name: String, path: String) { + self.id = id + self.name = name + self.path = path + } } struct ProjectEntityQuery: EnumerableEntityQuery, EntityStringQuery { @@ -144,10 +161,10 @@ struct ProjectEntityQuery: EnumerableEntityQuery, EntityStringQuery { } } -struct AgentEntity: AppEntity { +struct AgentEntity: AppEntity, Sendable { var id: String - var name: String - var available: Bool + @Property(title: "Name") var name: String + @Property(title: "Available") var available: Bool static var typeDisplayRepresentation: TypeDisplayRepresentation = "Agent" static var defaultQuery = AgentEntityQuery() @@ -155,6 +172,12 @@ struct AgentEntity: AppEntity { var displayRepresentation: DisplayRepresentation { DisplayRepresentation(title: "\(name)") } + + init(id: String, name: String, available: Bool) { + self.id = id + self.name = name + self.available = available + } } struct AgentEntityQuery: EnumerableEntityQuery, EntityStringQuery { @@ -210,17 +233,36 @@ struct StartThreadIntent: AppIntent { "Starts a new thread in a Pipper project with a chosen agent.", categoryName: "Productivity" ) - // App Intents extensions cannot use NSWorkspace to launch their containing - // app. macOS opens the host app after perform() returns when this is true; +static var isDiscoverable: Bool = true + // macOS opens the host app after perform() returns when this is true; // Electron then consumes the staged request during activation/startup. static var openAppWhenRun: Bool = true - @Parameter(title: "Project") var project: ProjectEntity - @Parameter(title: "Agent") var agent: AgentEntity? - @Parameter(title: "Task", requestValueDialog: "What should the thread work on?") var prompt: String? + private static func debugLog(_ message: String) { + let line = "[PipperIntents] \(message)\n" + if let data = line.data(using: .utf8) { + let url = URL(fileURLWithPath: "/tmp/pipper-intents-debug.log") + if FileManager.default.fileExists(atPath: url.path) { + if let handle = try? FileHandle(forWritingTo: url) { + handle.seekToEndOfFile() + handle.write(data) + try? handle.close() + } + } else { + try? data.write(to: url, options: .atomic) + } + } + } + + @Parameter(title: "Project" , description: "name of the project to run the agent in") var project: ProjectEntity + @Parameter(title: "Agent" , description: "the agent to run") var agent: AgentEntity? + @Parameter(title: "Task",description: "what action or a task in perform in a project with an agent", requestValueDialog: "What should the thread work on?") var prompt: String? func perform() async throws -> some IntentResult & ProvidesDialog { + Self.debugLog("perform start projectId=\(project.id) agentId=\(agent?.id ?? "nil") promptLen=\(prompt?.count ?? 0)") + Self.debugLog("candidateDirs=\(SiriCatalogStore.candidateDirs().map { $0.path })") let catalog = SiriCatalogStore.load() + Self.debugLog("catalog loaded: projects=\(catalog?.projects.count ?? -1) agents=\(catalog?.agents.count ?? -1)") // Revalidate availability at run time: the catalog may have changed // between entity resolution and perform(). let usableIds = Set((catalog?.agents ?? []).filter { $0.available }.map { $0.id }) @@ -265,9 +307,11 @@ struct StartThreadIntent: AppIntent { try data.write(to: url, options: .atomic) stagedCount += 1 } catch { + Self.debugLog("stage failed dir=\(base.path) error=\(error)") lastError = error } } + Self.debugLog("stagedCount=\(stagedCount) lastError=\(String(describing: lastError))") _ = dir if stagedCount == 0 { if let siriError = lastError as? SiriRequestError { diff --git a/native/pipper-intents/Tests/PipperIntentsTests/PipperIntentsTests.swift b/native/pipper-intents/Tests/PipperIntentsTests/PipperIntentsTests.swift new file mode 100644 index 0000000..7b0b554 --- /dev/null +++ b/native/pipper-intents/Tests/PipperIntentsTests/PipperIntentsTests.swift @@ -0,0 +1,118 @@ +import Foundation +import Testing +@testable import PipperIntents + +private func withTempCatalog(_ catalog: SiriCatalog, perform: () async throws -> Void) async throws { + let dir = FileManager.default.temporaryDirectory.appendingPathComponent("pipper-test-\(UUID().uuidString)", isDirectory: true) + try FileManager.default.createDirectory(at: dir, withIntermediateDirectories: true) + // Use PIPPER_LIBRARY_PATH override so SiriCatalogStore reads from temp dir + setenv("PIPPER_LIBRARY_PATH", dir.path, 1) + defer { unsetenv("PIPPER_LIBRARY_PATH"); try? FileManager.default.removeItem(at: dir) } + let data = try JSONEncoder().encode(catalog) + try data.write(to: dir.appendingPathComponent("siri-catalog.json"), options: .atomic) + try await perform() +} + +private func makeCatalog(projects: [SiriCatalogProject] = [], agents: [SiriCatalogAgent] = [], defaultAgentId: String = "codex-acp") -> SiriCatalog { + SiriCatalog(version: 1, updatedAt: ISO8601DateFormatter().string(from: Date()), defaultAgentId: defaultAgentId, projects: projects, agents: agents) +} + +@Suite("PipperIntents end-to-end", .serialized) +struct PipperIntentsTests { + @Test func projectQuerySuggestedEntities() async throws { + let catalog = makeCatalog(projects: [ + SiriCatalogProject(id: "p1", name: "My App", path: "/tmp/a"), + SiriCatalogProject(id: "p2", name: "Other", path: "/tmp/b"), + ], agents: [SiriCatalogAgent(id: "codex-acp", displayName: "Codex", available: true)]) + try await withTempCatalog(catalog) { + let q = ProjectEntityQuery() + let all = try await q.allEntities() + #expect(all.count == 2) + let suggested = try await q.suggestedEntities() + #expect(suggested.count == 2) + } + } + + @Test func projectQueryMatchingFilters() async throws { + let catalog = makeCatalog(projects: [ + SiriCatalogProject(id: "p1", name: "My App", path: "/Users/me/my-app"), + SiriCatalogProject(id: "p2", name: "Dotfiles", path: "/Users/me/dotfiles"), + ]) + try await withTempCatalog(catalog) { + let q = ProjectEntityQuery() + let matched = try await q.entities(matching: "my app") + #expect(matched.count == 1) + #expect(matched.first?.id == "p1") + let byPath = try await q.entities(matching: "dotfiles") + #expect(byPath.first?.id == "p2") + } + } + + @Test func projectQueryForIdentifiers() async throws { + let catalog = makeCatalog(projects: [SiriCatalogProject(id: "p1", name: "A", path: "/a")]) + try await withTempCatalog(catalog) { + let q = ProjectEntityQuery() + let res = try await q.entities(for: ["p1", "missing"]) + #expect(res.count == 1 && res.first?.id == "p1") + } + } + + @Test func agentQueryFiltersUnavailable() async throws { + let catalog = makeCatalog(agents: [ + SiriCatalogAgent(id: "codex-acp", displayName: "Codex", available: true), + SiriCatalogAgent(id: "opencode-acp", displayName: "opencode", available: false), + ]) + try await withTempCatalog(catalog) { + let q = AgentEntityQuery() + let all = try await q.allEntities() + #expect(all.count == 1 && all.first?.id == "codex-acp") + } + } + + @Test func startThreadIntentStagesRequest() async throws { + let catalog = makeCatalog( + projects: [SiriCatalogProject(id: "p1", name: "My App", path: "/tmp/a")], + agents: [SiriCatalogAgent(id: "codex-acp", displayName: "Codex", available: true)], + defaultAgentId: "codex-acp" + ) + try await withTempCatalog(catalog) { + let intent = StartThreadIntent() + // Resolve entities via queries to match Siri's flow + let project = try await ProjectEntityQuery().entities(for: ["p1"]).first! + let agent = try await AgentEntityQuery().entities(for: ["codex-acp"]).first! + intent.project = project + intent.agent = agent + intent.prompt = "Fix login bug" + let result = try await intent.perform() + // Verify file staged + let dir = URL(fileURLWithPath: ProcessInfo.processInfo.environment["PIPPER_LIBRARY_PATH"]!) + let requests = try FileManager.default.contentsOfDirectory(at: dir.appendingPathComponent("siri-requests"), includingPropertiesForKeys: nil) + #expect(requests.count == 1) + let data = try Data(contentsOf: requests[0]) + let json = try JSONSerialization.jsonObject(with: data) as! [String: String] + #expect(json["projectId"] == "p1") + #expect(json["agentId"] == "codex-acp") + #expect(json["prompt"] == "Fix login bug") + _ = result + } + } + + @Test func startThreadIntentUsesDefaultAgentWhenNoneChosen() async throws { + let catalog = makeCatalog( + projects: [SiriCatalogProject(id: "p1", name: "My App", path: "/tmp/a")], + agents: [SiriCatalogAgent(id: "codex-acp", displayName: "Codex", available: true)], + defaultAgentId: "codex-acp" + ) + try await withTempCatalog(catalog) { + let intent = StartThreadIntent() + intent.project = try await ProjectEntityQuery().entities(for: ["p1"]).first! + intent.agent = nil + intent.prompt = "Hello" + _ = try await intent.perform() + let dir = URL(fileURLWithPath: ProcessInfo.processInfo.environment["PIPPER_LIBRARY_PATH"]!) + let file = try FileManager.default.contentsOfDirectory(at: dir.appendingPathComponent("siri-requests"), includingPropertiesForKeys: nil).first! + let json = try JSONSerialization.jsonObject(with: Data(contentsOf: file)) as! [String: String] + #expect(json["agentId"] == "codex-acp") + } + } +} diff --git a/scripts/build.js b/scripts/build.js index 833ed0e..55739e2 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -91,7 +91,10 @@ function buildPipperIntents() { "Release", `CONFIGURATION_BUILD_DIR=${output}`, "PRODUCT_BUNDLE_IDENTIFIER=com.maker-or.omni.PipperIntents", - "CODE_SIGNING_ALLOWED=NO", + "CODE_SIGNING_ALLOWED=YES", + "CODE_SIGN_IDENTITY=-", + "CODE_SIGN_STYLE=Manual", + "CODE_SIGN_ENTITLEMENTS=../Extension/PipperIntents.entitlements", "build", ], { From 7925fa63da85bcad50eccf61eb4a563144ce9257 Mon Sep 17 00:00:00 2001 From: Harshith Pasupuleti Date: Fri, 11 Sep 2026 10:24:45 +0530 Subject: [PATCH 12/22] Complete PipperIntents Siri integration --- electron/agents/config.json | 14 +- electron/agents/registry.ts | 18 +- electron/main.ts | 8 +- electron/siri/siri-catalog.ts | 11 +- .../Sources/PipperIntents.swift | 248 ++++++++++++++---- .../PipperIntentsTests.swift | 21 +- package.json | 2 +- 7 files changed, 248 insertions(+), 74 deletions(-) diff --git a/electron/agents/config.json b/electron/agents/config.json index 8000458..39e4b73 100644 --- a/electron/agents/config.json +++ b/electron/agents/config.json @@ -10,7 +10,7 @@ "icon": "cursor", "docsUrl": "https://cursor.com/docs/cli/acp", "authHint": "Run `agent login` in your terminal (or set CURSOR_API_KEY) before connecting.", - "installHint": "Install Cursor CLI, then ensure `agent` is on your PATH (often ~/.local/bin/agent).", + "installHint": "Install the Cursor CLI (no GUI needed): `curl https://cursor.com/install -fsS | bash`, then ensure `agent` is on your PATH.", "installKind": "binary", "detectCommands": ["agent"] }, @@ -23,8 +23,8 @@ "args": [], "icon": "openai-codex", "docsUrl": "https://github.com/agentclientprotocol/codex-acp", - "authHint": "Sign in with ChatGPT or provide CODEX_API_KEY / OPENAI_API_KEY.", - "installHint": "npm install -g @agentclientprotocol/codex-acp (or use npx on first launch)", + "authHint": "Run `codex` once and choose Sign in with ChatGPT (or set CODEX_API_KEY / OPENAI_API_KEY).", + "installHint": "Install the Codex CLI (no GUI needed): `curl -fsSL https://chatgpt.com/codex/install.sh | sh`, then run `codex` once to sign in. Pipper connects over ACP automatically.", "installKind": "npx", "npmPackage": "@agentclientprotocol/codex-acp", "detectCommands": ["codex-acp"] @@ -38,8 +38,8 @@ "args": [], "icon": "anthropic", "docsUrl": "https://github.com/agentclientprotocol/claude-agent-acp", - "authHint": "Authenticate Claude Code / set ANTHROPIC_API_KEY before connecting.", - "installHint": "npm install -g @agentclientprotocol/claude-agent-acp (or use npx on first launch)", + "authHint": "Run `claude` once and complete the login prompt (or set ANTHROPIC_API_KEY).", + "installHint": "Install the Claude CLI (no GUI needed): `curl -fsSL https://claude.ai/install.sh | bash` (native install auto-updates). Pipper connects over ACP automatically.", "installKind": "npx", "npmPackage": "@agentclientprotocol/claude-agent-acp", "detectCommands": ["claude-agent-acp"] @@ -98,8 +98,8 @@ "args": ["agent", "stdio"], "icon": "xai", "docsUrl": "https://www.npmjs.com/package/@xai-official/grok", - "authHint": "Run `grok login` to sign in with your xAI account before connecting.", - "installHint": "npm install -g @xai-official/grok (or use npx on first launch)", + "authHint": "Run `grok login` to sign in via browser (or `grok login --device-auth` on headless machines).", + "installHint": "Install the Grok CLI (no GUI needed): `curl -fsSL https://x.ai/cli/install.sh | bash`, then verify with `grok --version`.", "installKind": "npx", "npmPackage": "@xai-official/grok", "detectCommands": ["grok"] diff --git a/electron/agents/registry.ts b/electron/agents/registry.ts index 6074428..2236b95 100644 --- a/electron/agents/registry.ts +++ b/electron/agents/registry.ts @@ -26,7 +26,7 @@ export const BUILTIN_ACP_AGENTS: AcpAgentDescriptor[] = [ docsUrl: "https://cursor.com/docs/cli/acp", authHint: "Run `agent login` in your terminal (or set CURSOR_API_KEY) before connecting.", installHint: - "Install Cursor CLI, then ensure `agent` is on your PATH (often ~/.local/bin/agent).", + "Install the Cursor CLI (no GUI needed): `curl https://cursor.com/install -fsS | bash`, then ensure `agent` is on your PATH.", installKind: "binary", detectCommands: ["agent"], }, @@ -39,8 +39,10 @@ export const BUILTIN_ACP_AGENTS: AcpAgentDescriptor[] = [ args: [], icon: "openai-codex", docsUrl: "https://github.com/agentclientprotocol/codex-acp", - authHint: "Sign in with ChatGPT or provide CODEX_API_KEY / OPENAI_API_KEY.", - installHint: "npm install -g @agentclientprotocol/codex-acp (or use npx on first launch)", + authHint: + "Run `codex` once and choose Sign in with ChatGPT (or set CODEX_API_KEY / OPENAI_API_KEY).", + installHint: + "Install the Codex CLI (no GUI needed): `curl -fsSL https://chatgpt.com/codex/install.sh | sh`, then run `codex` once to sign in. Pipper connects over ACP automatically.", installKind: "npx", npmPackage: "@agentclientprotocol/codex-acp", detectCommands: ["codex-acp"], @@ -54,9 +56,9 @@ export const BUILTIN_ACP_AGENTS: AcpAgentDescriptor[] = [ args: [], icon: "anthropic", docsUrl: "https://github.com/agentclientprotocol/claude-agent-acp", - authHint: "Authenticate Claude Code / set ANTHROPIC_API_KEY before connecting.", + authHint: "Run `claude` once and complete the login prompt (or set ANTHROPIC_API_KEY).", installHint: - "npm install -g @agentclientprotocol/claude-agent-acp (or use npx on first launch)", + "Install the Claude CLI (no GUI needed): `curl -fsSL https://claude.ai/install.sh | bash` (native install auto-updates). Pipper connects over ACP automatically.", installKind: "npx", npmPackage: "@agentclientprotocol/claude-agent-acp", detectCommands: ["claude-agent-acp"], @@ -85,8 +87,10 @@ export const BUILTIN_ACP_AGENTS: AcpAgentDescriptor[] = [ args: ["agent", "stdio"], icon: "xai", docsUrl: "https://www.npmjs.com/package/@xai-official/grok", - authHint: "Run `grok login` to sign in with your xAI account before connecting.", - installHint: "npm install -g @xai-official/grok (or use npx on first launch)", + authHint: + "Run `grok login` to sign in via browser (or `grok login --device-auth` on headless machines).", + installHint: + "Install the Grok CLI (no GUI needed): `curl -fsSL https://x.ai/cli/install.sh | bash`, then verify with `grok --version`.", installKind: "npx", npmPackage: "@xai-official/grok", detectCommands: ["grok"], diff --git a/electron/main.ts b/electron/main.ts index b5fc710..2ed7703 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -2103,8 +2103,14 @@ function registerIpc(): void { requireAgentManager().setPreferredAgentId(agentId); }); ipcMain.handle("agent:getSelectedAgentIds", () => getSelectedAgentIds()); - ipcMain.handle("agent:setSelectedAgentIds", (_event, agentIds: string[]) => { + ipcMain.handle("agent:setSelectedAgentIds", async (_event, agentIds: string[]) => { setSelectedAgentIds(agentIds); + try { + const { refreshSiriCatalog } = await import("./siri/siri-catalog.ts"); + refreshSiriCatalog(); + } catch (err) { + console.warn("[Main] Siri catalog refresh failed after agent selection change:", err); + } }); ipcMain.handle("agent:closeThreadSession", (_event, threadId: string) => requireAgentManager().closeThreadSession(threadId), diff --git a/electron/siri/siri-catalog.ts b/electron/siri/siri-catalog.ts index 6ed0bce..38d8a5f 100644 --- a/electron/siri/siri-catalog.ts +++ b/electron/siri/siri-catalog.ts @@ -1,6 +1,7 @@ import { mkdirSync, renameSync, writeFileSync } from "node:fs"; import { dirname, join } from "node:path"; import os from "node:os"; +import { getSelectedAgentIds } from "../db.ts"; import { getPipperLibraryPath, PIPPER_APP_GROUP_IDENTIFIER } from "../paths.ts"; import { listProjects } from "../projects.ts"; import { listRegisteredAgents, getDefaultAgentId } from "../agents/registry.ts"; @@ -60,15 +61,21 @@ export function buildSiriCatalog(): SiriCatalog { name: p.name, path: p.path, })); - const agents = listRegisteredAgents().map((a) => ({ + const selectedAgentIds = new Set(getSelectedAgentIds()); + const selectedAgents = listRegisteredAgents().filter((a) => selectedAgentIds.has(a.id)); + const agents = selectedAgents.map((a) => ({ id: a.id, displayName: a.displayName, available: a.available ?? false, })); + const configuredDefaultAgentId = getDefaultAgentId(); + const defaultAgentId = selectedAgents.some((a) => a.id === configuredDefaultAgentId) + ? configuredDefaultAgentId + : (selectedAgents[0]?.id ?? ""); return { version: 1, updatedAt: new Date().toISOString(), - defaultAgentId: getDefaultAgentId(), + defaultAgentId, projects, agents, }; diff --git a/native/pipper-intents/Sources/PipperIntents.swift b/native/pipper-intents/Sources/PipperIntents.swift index d3f15d2..45f0824 100644 --- a/native/pipper-intents/Sources/PipperIntents.swift +++ b/native/pipper-intents/Sources/PipperIntents.swift @@ -1,5 +1,38 @@ import AppIntents import Foundation +import OSLog + +enum SiriDiagnostics { + private static let logger = Logger( + subsystem: "com.maker-or.omni.pipper", + category: "AppIntents" + ) + + static func log(_ message: String) { + let line = "[PipperIntents] \(message)\n" + logger.info("\(message, privacy: .public)") + + let url = SiriCatalogStore.realHomeDirectory() + .appendingPathComponent("Library/pipper/intents-debug.log") + do { + try FileManager.default.createDirectory( + at: url.deletingLastPathComponent(), + withIntermediateDirectories: true + ) + if FileManager.default.fileExists(atPath: url.path), + let handle = try? FileHandle(forWritingTo: url) + { + handle.seekToEndOfFile() + handle.write(Data(line.utf8)) + try? handle.close() + } else { + try Data(line.utf8).write(to: url, options: .atomic) + } + } catch { + logger.error("file log failed: \(error.localizedDescription, privacy: .public)") + } + } +} // MARK: - Shared catalog (written by Electron, read by Siri) @@ -83,15 +116,28 @@ enum SiriCatalogStore { } static func load() -> SiriCatalog? { + SiriDiagnostics.log("catalog load begin dirs=\(candidateDirs().map(\.path))") for dir in candidateDirs() { let url = dir.appendingPathComponent("siri-catalog.json") - if let data = try? Data(contentsOf: url), - let catalog = try? JSONDecoder().decode(SiriCatalog.self, from: data) - { + guard let data = try? Data(contentsOf: url) else { + SiriDiagnostics.log("catalog load miss path=\(url.path)") + continue + } + do { + let catalog = try JSONDecoder().decode(SiriCatalog.self, from: data) + SiriDiagnostics.log( + "catalog load success path=\(url.path) projects=\(catalog.projects.count) agents=\(catalog.agents.count)" + ) return catalog + } catch { + SiriDiagnostics.log("catalog decode failed path=\(url.path) error=\(error)") } } - guard isPreviewExtension else { return nil } + guard isPreviewExtension else { + SiriDiagnostics.log("catalog load failed: no usable catalog") + return nil + } + SiriDiagnostics.log("catalog load using preview catalog") return SiriCatalog( version: 1, updatedAt: "preview", @@ -116,14 +162,14 @@ enum SiriCatalogStore { // MARK: - Entities (both dynamic -> AppEntity, not AppEnum) -struct ProjectEntity: AppEntity, Sendable { +struct ProjectEntity: AppEntity { + static var typeDisplayRepresentation: TypeDisplayRepresentation = "Project" + static var defaultQuery = ProjectEntityQuery() + var id: String @Property(title: "Name") var name: String @Property(title: "Path") var path: String - static var typeDisplayRepresentation: TypeDisplayRepresentation = "Project" - static var defaultQuery = ProjectEntityQuery() - var displayRepresentation: DisplayRepresentation { DisplayRepresentation(title: "\(name)", subtitle: "\(path)") } @@ -137,46 +183,56 @@ struct ProjectEntity: AppEntity, Sendable { struct ProjectEntityQuery: EnumerableEntityQuery, EntityStringQuery { func entities(for identifiers: [String]) async throws -> [ProjectEntity] { + StartThreadIntent.debugLog("projectQuery.entities identifiers=\(identifiers)") let all = SiriCatalogStore.load()?.projects ?? [] - return all.filter { identifiers.contains($0.id) }.map { + let result = all.filter { identifiers.contains($0.id) }.map { ProjectEntity(id: $0.id, name: $0.name, path: $0.path) } + StartThreadIntent.debugLog("projectQuery.entities resolved=\(result.map(\.id))") + return result } func suggestedEntities() async throws -> [ProjectEntity] { - try await allEntities() + StartThreadIntent.debugLog("projectQuery.suggested begin") + return try await allEntities() } func allEntities() async throws -> [ProjectEntity] { + StartThreadIntent.debugLog("projectQuery.all begin") let all = SiriCatalogStore.load()?.projects ?? [] - return all.map { ProjectEntity(id: $0.id, name: $0.name, path: $0.path) } + let result = all.map { ProjectEntity(id: $0.id, name: $0.name, path: $0.path) } + StartThreadIntent.debugLog("projectQuery.all resultCount=\(result.count)") + return result } func entities(matching string: String) async throws -> [ProjectEntity] { + StartThreadIntent.debugLog("projectQuery.match begin inputLen=\(string.count)") let all = SiriCatalogStore.load()?.projects ?? [] - return all.filter { + let result = all.filter { $0.name.localizedCaseInsensitiveContains(string) || $0.path.localizedCaseInsensitiveContains(string) }.map { ProjectEntity(id: $0.id, name: $0.name, path: $0.path) } + StartThreadIntent.debugLog("projectQuery.match resultCount=\(result.count)") + return result } } -struct AgentEntity: AppEntity, Sendable { - var id: String - @Property(title: "Name") var name: String - @Property(title: "Available") var available: Bool - +struct AgentEntity: AppEntity { static var typeDisplayRepresentation: TypeDisplayRepresentation = "Agent" static var defaultQuery = AgentEntityQuery() + var id: String + @Property(title: "Name") var name: String + var available: Bool + var displayRepresentation: DisplayRepresentation { DisplayRepresentation(title: "\(name)") } init(id: String, name: String, available: Bool) { self.id = id - self.name = name self.available = available + self.name = name } } @@ -184,29 +240,44 @@ struct AgentEntityQuery: EnumerableEntityQuery, EntityStringQuery { /// Only usable agents are ever offered — staging a thread for a missing /// CLI would fail later in Electron. private func usableAgents() -> [SiriCatalogAgent] { - (SiriCatalogStore.load()?.agents ?? []).filter { $0.available } + let all = SiriCatalogStore.load()?.agents ?? [] + let usable = all.filter { $0.available } + StartThreadIntent.debugLog( + "agentQuery.usable total=\(all.count) available=\(usable.count) ids=\(usable.map(\.id))" + ) + return usable } func entities(for identifiers: [String]) async throws -> [AgentEntity] { - usableAgents().filter { identifiers.contains($0.id) }.map { + StartThreadIntent.debugLog("agentQuery.entities identifiers=\(identifiers)") + let result = usableAgents().filter { identifiers.contains($0.id) }.map { AgentEntity(id: $0.id, name: $0.displayName, available: $0.available) } + StartThreadIntent.debugLog("agentQuery.entities resolved=\(result.map(\.id))") + return result } func suggestedEntities() async throws -> [AgentEntity] { - try await allEntities() + StartThreadIntent.debugLog("agentQuery.suggested begin") + return try await allEntities() } func allEntities() async throws -> [AgentEntity] { - usableAgents().map { + StartThreadIntent.debugLog("agentQuery.all begin") + let result = usableAgents().map { AgentEntity(id: $0.id, name: $0.displayName, available: $0.available) } + StartThreadIntent.debugLog("agentQuery.all resultCount=\(result.count)") + return result } func entities(matching string: String) async throws -> [AgentEntity] { - usableAgents().filter { $0.displayName.localizedCaseInsensitiveContains(string) }.map { + StartThreadIntent.debugLog("agentQuery.match begin inputLen=\(string.count)") + let result = usableAgents().filter { $0.displayName.localizedCaseInsensitiveContains(string) }.map { AgentEntity(id: $0.id, name: $0.displayName, available: $0.available) } + StartThreadIntent.debugLog("agentQuery.match resultCount=\(result.count)") + return result } } @@ -234,48 +305,36 @@ struct StartThreadIntent: AppIntent { categoryName: "Productivity" ) static var isDiscoverable: Bool = true - // macOS opens the host app after perform() returns when this is true; - // Electron then consumes the staged request during activation/startup. - static var openAppWhenRun: Bool = true - - private static func debugLog(_ message: String) { - let line = "[PipperIntents] \(message)\n" - if let data = line.data(using: .utf8) { - let url = URL(fileURLWithPath: "/tmp/pipper-intents-debug.log") - if FileManager.default.fileExists(atPath: url.path) { - if let handle = try? FileHandle(forWritingTo: url) { - handle.seekToEndOfFile() - handle.write(data) - try? handle.close() - } - } else { - try? data.write(to: url, options: .atomic) - } - } + // NOTE (ad-hoc debugging): openAppWhenRun=true requires the system to + // resolve the containing host app, which fails for ad-hoc-signed builds + // and aborts the run before perform(). Disabled until proven otherwise; + // Electron already consumes staged requests on next activation/startup. + static var openAppWhenRun: Bool = false + + static func debugLog(_ message: String) { + SiriDiagnostics.log(message) } @Parameter(title: "Project" , description: "name of the project to run the agent in") var project: ProjectEntity - @Parameter(title: "Agent" , description: "the agent to run") var agent: AgentEntity? + @Parameter(title: "Agent" , description: "the agent to run") var agent: AgentEntity @Parameter(title: "Task",description: "what action or a task in perform in a project with an agent", requestValueDialog: "What should the thread work on?") var prompt: String? func perform() async throws -> some IntentResult & ProvidesDialog { - Self.debugLog("perform start projectId=\(project.id) agentId=\(agent?.id ?? "nil") promptLen=\(prompt?.count ?? 0)") + Self.debugLog("perform entered") + Self.debugLog("perform start projectId=\(project.id) agentId=\(agent.id) promptLen=\(prompt?.count ?? 0)") Self.debugLog("candidateDirs=\(SiriCatalogStore.candidateDirs().map { $0.path })") let catalog = SiriCatalogStore.load() Self.debugLog("catalog loaded: projects=\(catalog?.projects.count ?? -1) agents=\(catalog?.agents.count ?? -1)") // Revalidate availability at run time: the catalog may have changed // between entity resolution and perform(). let usableIds = Set((catalog?.agents ?? []).filter { $0.available }.map { $0.id }) - let defaultId = catalog?.defaultAgentId - let resolvedAgentId: String? - if let chosen = agent { - guard usableIds.contains(chosen.id) else { - throw SiriRequestError.agentUnavailable(chosen.name) - } - resolvedAgentId = chosen.id - } else { - resolvedAgentId = defaultId.flatMap { usableIds.contains($0) ? $0 : nil } + let chosenAgent = agent + guard usableIds.contains(chosenAgent.id) else { + Self.debugLog("perform rejected agentId=\(chosenAgent.id) reason=unavailable") + throw SiriRequestError.agentUnavailable(chosenAgent.name) } + let resolvedAgentId = chosenAgent.id + Self.debugLog("perform validation passed agentId=\(resolvedAgentId)") if SiriCatalogStore.isPreviewExtension { return .result( dialog: "Preview: would start a thread in \(project.name)." @@ -287,7 +346,7 @@ static var isDiscoverable: Bool = true let payload: [String: String] = [ "requestId": requestId, "projectId": project.id, - "agentId": resolvedAgentId ?? "", + "agentId": resolvedAgentId, "prompt": prompt ?? "", ] let dir = SiriCatalogStore.baseDir().appendingPathComponent("siri-requests", isDirectory: true) @@ -306,6 +365,7 @@ static var isDiscoverable: Bool = true } try data.write(to: url, options: .atomic) stagedCount += 1 + Self.debugLog("stage succeeded dir=\(base.path) requestId=\(requestId)") } catch { Self.debugLog("stage failed dir=\(base.path) error=\(error)") lastError = error @@ -325,6 +385,88 @@ static var isDiscoverable: Bool = true } } +// MARK: - Entity parameter probe (no staging) + +struct CheckPipperParametersIntent: AppIntent { + static var title: LocalizedStringResource = "Check Pipper parameters" + static var description = IntentDescription( + "Diagnostic action that verifies Project and Agent parameters without creating a thread.", + categoryName: "Productivity" + ) + static var isDiscoverable: Bool = true + static var openAppWhenRun: Bool = false + + @Parameter(title: "Project", description: "the project to inspect") var project: ProjectEntity + @Parameter(title: "Agent", description: "the agent to inspect") var agent: AgentEntity + @Parameter(title: "Task") var prompt: String? + + func perform() async throws -> some IntentResult & ProvidesDialog { + StartThreadIntent.debugLog( + "parameterProbe perform projectId=\(project.id) agentId=\(agent.id) promptLen=\(prompt?.count ?? 0)" + ) + return .result( + dialog: "Parameters resolved for \(project.name) with \(agent.name)." + ) + } +} + +// MARK: - Primitive parameter probe (bypasses AppEntity conversion) + +struct CheckPipperIDsIntent: AppIntent { + static var title: LocalizedStringResource = "Check Pipper IDs" + static var description = IntentDescription( + "Diagnostic action that verifies primitive Project and Agent IDs without creating a thread.", + categoryName: "Productivity" + ) + static var isDiscoverable: Bool = true + static var openAppWhenRun: Bool = false + + @Parameter(title: "Project ID", description: "the project identifier to inspect") var projectId: String + @Parameter(title: "Agent ID", description: "the agent identifier to inspect") var agentId: String + @Parameter(title: "Task") var prompt: String? + + func perform() async throws -> some IntentResult & ProvidesDialog { + StartThreadIntent.debugLog( + "idProbe perform projectId=\(projectId) agentId=\(agentId) promptLen=\(prompt?.count ?? 0)" + ) + return .result( + dialog: "Primitive IDs received for project \(projectId) and agent \(agentId)." + ) + } +} + +// MARK: - Temporary bisect intent (no parameters, no entities) + +struct PingIntent: AppIntent { + static var title: LocalizedStringResource = "Ping Pipper" + static var description = IntentDescription( + "Temporary diagnostic action. Always succeeds.", + categoryName: "Productivity" + ) + + func perform() async throws -> some IntentResult & ProvidesDialog { + return .result(dialog: "Pipper is reachable.") + } +} + +// MARK: - Temporary bisect intent (string parameter only, no entities) + +struct PingWithTextIntent: AppIntent { + static var title: LocalizedStringResource = "Ping Pipper With Text" + static var description = IntentDescription( + "Temporary diagnostic action with a text parameter.", + categoryName: "Productivity" + ) + + @Parameter(title: "Task") var prompt: String? + + func perform() async throws -> some IntentResult & ProvidesDialog { + StartThreadIntent.debugLog("pingWithText entered promptLen=\(prompt?.count ?? -1)") + // Static dialog: bisects interpolated-dialog failure vs parameter failure. + return .result(dialog: "Text received.") + } +} + // MARK: - Shortcuts registration (Siri phrases must contain applicationName) struct PipperShortcuts: AppShortcutsProvider { diff --git a/native/pipper-intents/Tests/PipperIntentsTests/PipperIntentsTests.swift b/native/pipper-intents/Tests/PipperIntentsTests/PipperIntentsTests.swift index 7b0b554..2018e5b 100644 --- a/native/pipper-intents/Tests/PipperIntentsTests/PipperIntentsTests.swift +++ b/native/pipper-intents/Tests/PipperIntentsTests/PipperIntentsTests.swift @@ -97,16 +97,16 @@ struct PipperIntentsTests { } } - @Test func startThreadIntentUsesDefaultAgentWhenNoneChosen() async throws { + @Test func startThreadIntentRequiresAndStagesChosenAgent() async throws { let catalog = makeCatalog( projects: [SiriCatalogProject(id: "p1", name: "My App", path: "/tmp/a")], agents: [SiriCatalogAgent(id: "codex-acp", displayName: "Codex", available: true)], defaultAgentId: "codex-acp" ) try await withTempCatalog(catalog) { - let intent = StartThreadIntent() + let intent = StartThreadIntent() intent.project = try await ProjectEntityQuery().entities(for: ["p1"]).first! - intent.agent = nil + intent.agent = try await AgentEntityQuery().entities(for: ["codex-acp"]).first! intent.prompt = "Hello" _ = try await intent.perform() let dir = URL(fileURLWithPath: ProcessInfo.processInfo.environment["PIPPER_LIBRARY_PATH"]!) @@ -116,3 +116,18 @@ struct PipperIntentsTests { } } } + +extension PipperIntentsTests { + @Test func entitiesForResolvesRealIds() async throws { + let catalog = SiriCatalog( + version: 1, updatedAt: "2026-09-09T09:03:09.283Z", defaultAgentId: "cursor-acp", + projects: [SiriCatalogProject(id: "bae0366a-9087-4e4c-966d-bd4ef5ce1295", name: "FolkLore-LiveLore-", path: "/Users/me/code/FolkLore-LiveLore-")], + agents: [SiriCatalogAgent(id: "opencode-acp", displayName: "opencode", available: true)] + ) + try await withTempCatalog(catalog) { + let projects = try await ProjectEntityQuery().entities(for: ["bae0366a-9087-4e4c-966d-bd4ef5ce1295"]) + #expect(projects.count == 1) + #expect(projects.first?.name == "FolkLore-LiveLore-") + } + } +} diff --git a/package.json b/package.json index 1e9df56..780ad4e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pipper-code-alpha", - "version": "0.0.23", + "version": "0.0.25", "private": true, "type": "module", "main": "out/main/index.js", From 34a541c8925695bbf684a8feef1cfb8e15fae004 Mon Sep 17 00:00:00 2001 From: Harshith Pasupuleti Date: Fri, 11 Sep 2026 11:46:11 +0530 Subject: [PATCH 13/22] Fix Shortcuts thread creation: String IDs with pickers instead of AppEntity AppEntity deserialization failed pre-perform() with LNPerformActionErrorCodeUnsupportedValueType (EntityIdentifier not registered), so Start Pipper thread never reached perform(). String params with DynamicOptionsProvider keep the project/agent pickers while bypassing the broken entity decoding. Also removes probe intents and dead entity queries. --- .../Sources/PipperIntents.swift | 236 ++++-------------- .../PipperIntentsTests.swift | 60 ++--- package.json | 2 +- 3 files changed, 71 insertions(+), 227 deletions(-) diff --git a/native/pipper-intents/Sources/PipperIntents.swift b/native/pipper-intents/Sources/PipperIntents.swift index 45f0824..28ee026 100644 --- a/native/pipper-intents/Sources/PipperIntents.swift +++ b/native/pipper-intents/Sources/PipperIntents.swift @@ -160,136 +160,54 @@ enum SiriCatalogStore { } } -// MARK: - Entities (both dynamic -> AppEntity, not AppEnum) - -struct ProjectEntity: AppEntity { - static var typeDisplayRepresentation: TypeDisplayRepresentation = "Project" - static var defaultQuery = ProjectEntityQuery() - - var id: String - @Property(title: "Name") var name: String - @Property(title: "Path") var path: String - - var displayRepresentation: DisplayRepresentation { - DisplayRepresentation(title: "\(name)", subtitle: "\(path)") - } - - init(id: String, name: String, path: String) { - self.id = id - self.name = name - self.path = path - } -} - -struct ProjectEntityQuery: EnumerableEntityQuery, EntityStringQuery { - func entities(for identifiers: [String]) async throws -> [ProjectEntity] { - StartThreadIntent.debugLog("projectQuery.entities identifiers=\(identifiers)") - let all = SiriCatalogStore.load()?.projects ?? [] - let result = all.filter { identifiers.contains($0.id) }.map { - ProjectEntity(id: $0.id, name: $0.name, path: $0.path) +// MARK: - Options (String IDs + pickers; AppEntity decoding fails pre-perform, see intents-debug.log LNPerformActionErrorCodeUnsupportedValueType) +// decoding a saved AppEntity value before perform(). These providers retain +// the same named pickers while passing the stable catalog IDs as Strings. +struct ProjectOptionsProvider: DynamicOptionsProvider { + typealias Result = IntentItemCollection + typealias DefaultValue = String + + func results() async throws -> IntentItemCollection { + let projects = SiriCatalogStore.load()?.projects ?? [] + let items = projects.map { + IntentItem( + $0.id, + title: LocalizedStringResource(stringLiteral: $0.name), + subtitle: LocalizedStringResource(stringLiteral: $0.path) + ) } - StartThreadIntent.debugLog("projectQuery.entities resolved=\(result.map(\.id))") - return result - } - - func suggestedEntities() async throws -> [ProjectEntity] { - StartThreadIntent.debugLog("projectQuery.suggested begin") - return try await allEntities() - } - - func allEntities() async throws -> [ProjectEntity] { - StartThreadIntent.debugLog("projectQuery.all begin") - let all = SiriCatalogStore.load()?.projects ?? [] - let result = all.map { ProjectEntity(id: $0.id, name: $0.name, path: $0.path) } - StartThreadIntent.debugLog("projectQuery.all resultCount=\(result.count)") - return result - } - - func entities(matching string: String) async throws -> [ProjectEntity] { - StartThreadIntent.debugLog("projectQuery.match begin inputLen=\(string.count)") - let all = SiriCatalogStore.load()?.projects ?? [] - let result = all.filter { - $0.name.localizedCaseInsensitiveContains(string) - || $0.path.localizedCaseInsensitiveContains(string) - }.map { ProjectEntity(id: $0.id, name: $0.name, path: $0.path) } - StartThreadIntent.debugLog("projectQuery.match resultCount=\(result.count)") - return result + return IntentItemCollection(sections: [IntentItemSection(items: items)]) } } -struct AgentEntity: AppEntity { - static var typeDisplayRepresentation: TypeDisplayRepresentation = "Agent" - static var defaultQuery = AgentEntityQuery() - - var id: String - @Property(title: "Name") var name: String - var available: Bool - - var displayRepresentation: DisplayRepresentation { - DisplayRepresentation(title: "\(name)") - } - - init(id: String, name: String, available: Bool) { - self.id = id - self.available = available - self.name = name - } -} - -struct AgentEntityQuery: EnumerableEntityQuery, EntityStringQuery { - /// Only usable agents are ever offered — staging a thread for a missing - /// CLI would fail later in Electron. - private func usableAgents() -> [SiriCatalogAgent] { - let all = SiriCatalogStore.load()?.agents ?? [] - let usable = all.filter { $0.available } - StartThreadIntent.debugLog( - "agentQuery.usable total=\(all.count) available=\(usable.count) ids=\(usable.map(\.id))" - ) - return usable - } - - func entities(for identifiers: [String]) async throws -> [AgentEntity] { - StartThreadIntent.debugLog("agentQuery.entities identifiers=\(identifiers)") - let result = usableAgents().filter { identifiers.contains($0.id) }.map { - AgentEntity(id: $0.id, name: $0.displayName, available: $0.available) - } - StartThreadIntent.debugLog("agentQuery.entities resolved=\(result.map(\.id))") - return result - } - - func suggestedEntities() async throws -> [AgentEntity] { - StartThreadIntent.debugLog("agentQuery.suggested begin") - return try await allEntities() - } - - func allEntities() async throws -> [AgentEntity] { - StartThreadIntent.debugLog("agentQuery.all begin") - let result = usableAgents().map { - AgentEntity(id: $0.id, name: $0.displayName, available: $0.available) - } - StartThreadIntent.debugLog("agentQuery.all resultCount=\(result.count)") - return result - } +struct AgentOptionsProvider: DynamicOptionsProvider { + typealias Result = IntentItemCollection + typealias DefaultValue = String - func entities(matching string: String) async throws -> [AgentEntity] { - StartThreadIntent.debugLog("agentQuery.match begin inputLen=\(string.count)") - let result = usableAgents().filter { $0.displayName.localizedCaseInsensitiveContains(string) }.map { - AgentEntity(id: $0.id, name: $0.displayName, available: $0.available) + func results() async throws -> IntentItemCollection { + let agents = SiriCatalogStore.load()?.agents.filter(\.available) ?? [] + let items = agents.map { + IntentItem( + $0.id, + title: LocalizedStringResource(stringLiteral: $0.displayName) + ) } - StartThreadIntent.debugLog("agentQuery.match resultCount=\(result.count)") - return result + return IntentItemCollection(sections: [IntentItemSection(items: items)]) } } enum SiriRequestError: Error, CustomLocalizedStringResourceConvertible { case encodingFailed case stagingFailed + case projectUnavailable(String) case agentUnavailable(String) var localizedStringResource: LocalizedStringResource { switch self { case .encodingFailed: return "Couldn't prepare the thread request." case .stagingFailed: return "Couldn't save the thread request. Please try again." + case .projectUnavailable(let id): + return "The project \(id) isn't available. Pick an available project." case .agentUnavailable(let name): return "The agent \(name) isn't available. Pick an installed agent." } @@ -305,39 +223,40 @@ struct StartThreadIntent: AppIntent { categoryName: "Productivity" ) static var isDiscoverable: Bool = true - // NOTE (ad-hoc debugging): openAppWhenRun=true requires the system to - // resolve the containing host app, which fails for ad-hoc-signed builds - // and aborts the run before perform(). Disabled until proven otherwise; - // Electron already consumes staged requests on next activation/startup. + // Ad-hoc-signed builds cannot use App Intents' host-app launch handshake. + // The result below opens the app's registered URL scheme instead. static var openAppWhenRun: Bool = false static func debugLog(_ message: String) { SiriDiagnostics.log(message) } - @Parameter(title: "Project" , description: "name of the project to run the agent in") var project: ProjectEntity - @Parameter(title: "Agent" , description: "the agent to run") var agent: AgentEntity + @Parameter(title: "Project", description: "name of the project to run the agent in", optionsProvider: ProjectOptionsProvider()) var projectId: String + @Parameter(title: "Agent", description: "the agent to run", optionsProvider: AgentOptionsProvider()) var agentId: String @Parameter(title: "Task",description: "what action or a task in perform in a project with an agent", requestValueDialog: "What should the thread work on?") var prompt: String? func perform() async throws -> some IntentResult & ProvidesDialog { Self.debugLog("perform entered") - Self.debugLog("perform start projectId=\(project.id) agentId=\(agent.id) promptLen=\(prompt?.count ?? 0)") + Self.debugLog("perform start projectId=\(projectId) agentId=\(agentId) promptLen=\(prompt?.count ?? 0)") Self.debugLog("candidateDirs=\(SiriCatalogStore.candidateDirs().map { $0.path })") let catalog = SiriCatalogStore.load() Self.debugLog("catalog loaded: projects=\(catalog?.projects.count ?? -1) agents=\(catalog?.agents.count ?? -1)") + guard let chosenProject = catalog?.projects.first(where: { $0.id == projectId }) else { + Self.debugLog("perform rejected projectId=\(projectId) reason=unavailable") + throw SiriRequestError.projectUnavailable(projectId) + } // Revalidate availability at run time: the catalog may have changed // between entity resolution and perform(). let usableIds = Set((catalog?.agents ?? []).filter { $0.available }.map { $0.id }) - let chosenAgent = agent - guard usableIds.contains(chosenAgent.id) else { - Self.debugLog("perform rejected agentId=\(chosenAgent.id) reason=unavailable") - throw SiriRequestError.agentUnavailable(chosenAgent.name) + guard usableIds.contains(agentId) else { + let agentName = catalog?.agents.first(where: { $0.id == agentId })?.displayName ?? agentId + Self.debugLog("perform rejected agentId=\(agentId) reason=unavailable") + throw SiriRequestError.agentUnavailable(agentName) } - let resolvedAgentId = chosenAgent.id - Self.debugLog("perform validation passed agentId=\(resolvedAgentId)") + Self.debugLog("perform validation passed agentId=\(agentId)") if SiriCatalogStore.isPreviewExtension { return .result( - dialog: "Preview: would start a thread in \(project.name)." + dialog: "Preview: would start a thread in \(chosenProject.name)." ) } // Stage a pending request. The host app is opened automatically after the @@ -345,8 +264,8 @@ static var isDiscoverable: Bool = true let requestId = UUID().uuidString let payload: [String: String] = [ "requestId": requestId, - "projectId": project.id, - "agentId": resolvedAgentId, + "projectId": projectId, + "agentId": agentId, "prompt": prompt ?? "", ] let dir = SiriCatalogStore.baseDir().appendingPathComponent("siri-requests", isDirectory: true) @@ -379,59 +298,14 @@ static var isDiscoverable: Bool = true } throw SiriRequestError.stagingFailed } - return .result( - dialog: "Starting a thread in \(project.name)." - ) - } -} - -// MARK: - Entity parameter probe (no staging) - -struct CheckPipperParametersIntent: AppIntent { - static var title: LocalizedStringResource = "Check Pipper parameters" - static var description = IntentDescription( - "Diagnostic action that verifies Project and Agent parameters without creating a thread.", - categoryName: "Productivity" - ) - static var isDiscoverable: Bool = true - static var openAppWhenRun: Bool = false - - @Parameter(title: "Project", description: "the project to inspect") var project: ProjectEntity - @Parameter(title: "Agent", description: "the agent to inspect") var agent: AgentEntity - @Parameter(title: "Task") var prompt: String? - - func perform() async throws -> some IntentResult & ProvidesDialog { - StartThreadIntent.debugLog( - "parameterProbe perform projectId=\(project.id) agentId=\(agent.id) promptLen=\(prompt?.count ?? 0)" - ) - return .result( - dialog: "Parameters resolved for \(project.name) with \(agent.name)." - ) - } -} - -// MARK: - Primitive parameter probe (bypasses AppEntity conversion) - -struct CheckPipperIDsIntent: AppIntent { - static var title: LocalizedStringResource = "Check Pipper IDs" - static var description = IntentDescription( - "Diagnostic action that verifies primitive Project and Agent IDs without creating a thread.", - categoryName: "Productivity" - ) - static var isDiscoverable: Bool = true - static var openAppWhenRun: Bool = false - - @Parameter(title: "Project ID", description: "the project identifier to inspect") var projectId: String - @Parameter(title: "Agent ID", description: "the agent identifier to inspect") var agentId: String - @Parameter(title: "Task") var prompt: String? - - func perform() async throws -> some IntentResult & ProvidesDialog { - StartThreadIntent.debugLog( - "idProbe perform projectId=\(projectId) agentId=\(agentId) promptLen=\(prompt?.count ?? 0)" - ) - return .result( - dialog: "Primitive IDs received for project \(projectId) and agent \(agentId)." - ) + if #available(macOS 15.2, *) { + let openURL = URL(string: "pipper://siri/\(requestId)")! + return .result( + opensIntent: OpenURLIntent(openURL), + dialog: "Starting a thread in \(chosenProject.name)." + ) + } + return .result(dialog: "Starting a thread in \(chosenProject.name).") } } diff --git a/native/pipper-intents/Tests/PipperIntentsTests/PipperIntentsTests.swift b/native/pipper-intents/Tests/PipperIntentsTests/PipperIntentsTests.swift index 2018e5b..e5f7dd7 100644 --- a/native/pipper-intents/Tests/PipperIntentsTests/PipperIntentsTests.swift +++ b/native/pipper-intents/Tests/PipperIntentsTests/PipperIntentsTests.swift @@ -19,53 +19,25 @@ private func makeCatalog(projects: [SiriCatalogProject] = [], agents: [SiriCatal @Suite("PipperIntents end-to-end", .serialized) struct PipperIntentsTests { - @Test func projectQuerySuggestedEntities() async throws { + @Test func projectOptionsProviderListsProjects() async throws { let catalog = makeCatalog(projects: [ SiriCatalogProject(id: "p1", name: "My App", path: "/tmp/a"), SiriCatalogProject(id: "p2", name: "Other", path: "/tmp/b"), ], agents: [SiriCatalogAgent(id: "codex-acp", displayName: "Codex", available: true)]) try await withTempCatalog(catalog) { - let q = ProjectEntityQuery() - let all = try await q.allEntities() - #expect(all.count == 2) - let suggested = try await q.suggestedEntities() - #expect(suggested.count == 2) + let items = try await ProjectOptionsProvider().results() + #expect(items.sections.first?.items.count == 2) } } - @Test func projectQueryMatchingFilters() async throws { - let catalog = makeCatalog(projects: [ - SiriCatalogProject(id: "p1", name: "My App", path: "/Users/me/my-app"), - SiriCatalogProject(id: "p2", name: "Dotfiles", path: "/Users/me/dotfiles"), - ]) - try await withTempCatalog(catalog) { - let q = ProjectEntityQuery() - let matched = try await q.entities(matching: "my app") - #expect(matched.count == 1) - #expect(matched.first?.id == "p1") - let byPath = try await q.entities(matching: "dotfiles") - #expect(byPath.first?.id == "p2") - } - } - - @Test func projectQueryForIdentifiers() async throws { - let catalog = makeCatalog(projects: [SiriCatalogProject(id: "p1", name: "A", path: "/a")]) - try await withTempCatalog(catalog) { - let q = ProjectEntityQuery() - let res = try await q.entities(for: ["p1", "missing"]) - #expect(res.count == 1 && res.first?.id == "p1") - } - } - - @Test func agentQueryFiltersUnavailable() async throws { + @Test func agentOptionsProviderFiltersUnavailable() async throws { let catalog = makeCatalog(agents: [ SiriCatalogAgent(id: "codex-acp", displayName: "Codex", available: true), SiriCatalogAgent(id: "opencode-acp", displayName: "opencode", available: false), ]) try await withTempCatalog(catalog) { - let q = AgentEntityQuery() - let all = try await q.allEntities() - #expect(all.count == 1 && all.first?.id == "codex-acp") + let items = try await AgentOptionsProvider().results() + #expect(items.sections.first?.items.count == 1) } } @@ -77,11 +49,8 @@ struct PipperIntentsTests { ) try await withTempCatalog(catalog) { let intent = StartThreadIntent() - // Resolve entities via queries to match Siri's flow - let project = try await ProjectEntityQuery().entities(for: ["p1"]).first! - let agent = try await AgentEntityQuery().entities(for: ["codex-acp"]).first! - intent.project = project - intent.agent = agent + intent.projectId = "p1" + intent.agentId = "codex-acp" intent.prompt = "Fix login bug" let result = try await intent.perform() // Verify file staged @@ -105,8 +74,8 @@ struct PipperIntentsTests { ) try await withTempCatalog(catalog) { let intent = StartThreadIntent() - intent.project = try await ProjectEntityQuery().entities(for: ["p1"]).first! - intent.agent = try await AgentEntityQuery().entities(for: ["codex-acp"]).first! + intent.projectId = "p1" + intent.agentId = "codex-acp" intent.prompt = "Hello" _ = try await intent.perform() let dir = URL(fileURLWithPath: ProcessInfo.processInfo.environment["PIPPER_LIBRARY_PATH"]!) @@ -118,16 +87,17 @@ struct PipperIntentsTests { } extension PipperIntentsTests { - @Test func entitiesForResolvesRealIds() async throws { + @Test func optionsProvidersResolveRealIds() async throws { let catalog = SiriCatalog( version: 1, updatedAt: "2026-09-09T09:03:09.283Z", defaultAgentId: "cursor-acp", projects: [SiriCatalogProject(id: "bae0366a-9087-4e4c-966d-bd4ef5ce1295", name: "FolkLore-LiveLore-", path: "/Users/me/code/FolkLore-LiveLore-")], agents: [SiriCatalogAgent(id: "opencode-acp", displayName: "opencode", available: true)] ) try await withTempCatalog(catalog) { - let projects = try await ProjectEntityQuery().entities(for: ["bae0366a-9087-4e4c-966d-bd4ef5ce1295"]) - #expect(projects.count == 1) - #expect(projects.first?.name == "FolkLore-LiveLore-") + let projects = try await ProjectOptionsProvider().results() + #expect(projects.sections.first?.items.count == 1) + let agents = try await AgentOptionsProvider().results() + #expect(agents.sections.first?.items.count == 1) } } } diff --git a/package.json b/package.json index 780ad4e..3db38bc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pipper-code-alpha", - "version": "0.0.25", + "version": "0.0.31", "private": true, "type": "module", "main": "out/main/index.js", From 86674747b4d996b15ffe6aeaafa8a087dc96bd6a Mon Sep 17 00:00:00 2001 From: Harshith Pasupuleti Date: Fri, 11 Sep 2026 14:22:15 +0530 Subject: [PATCH 14/22] Fix Siri cold launch blocking the window; drop App Group; inline Spotlight summary Startup awaited consumePendingSiriRequests() before createMainWindow(), and consumeSiriRequest awaited manager.sendPrompt(), which only resolves when the agent's turn finishes. A Siri-launched app therefore showed a dock icon and no window until the agent was done. Prompt delivery is now fire-and-forget (deliverSiriPrompt) and the request drain runs after window creation without being awaited. Remove the App Group container from both sides: ad-hoc builds have no Team ID, so the extension got EPERM on every run, and there were never signed builds to migrate from. Only ~/Library/pipper and ~/Library/Application Support/Pipper remain. StartThreadIntent: make Task required (optional params are skipped by Spotlight/Siri) and add a parameterSummary so Spotlight renders "Start [Task] in [Project] with [Agent]" inline. Add spotlight.md notes on IndexedEntity; OpenIntent is out of scope on ad-hoc builds. Co-Authored-By: Claude Opus 5 (1M context) --- build/entitlements.mac.plist | 4 - electron/main.ts | 50 +++++++++--- electron/paths.ts | 3 - electron/siri/siri-catalog.ts | 18 ++--- native/pipper-intents/README.md | 19 ++--- .../Sources/PipperIntents.swift | 38 +++++----- spotlight.md | 76 +++++++++++++++++++ 7 files changed, 149 insertions(+), 59 deletions(-) create mode 100644 spotlight.md diff --git a/build/entitlements.mac.plist b/build/entitlements.mac.plist index 2badb19..5208375 100644 --- a/build/entitlements.mac.plist +++ b/build/entitlements.mac.plist @@ -12,9 +12,5 @@ com.apple.security.cs.allow-dyld-environment-variables - com.apple.security.application-groups - - group.com.maker-or.omni.pipper - diff --git a/electron/main.ts b/electron/main.ts index 1e09473..3adea82 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -513,7 +513,7 @@ async function consumeSiriRequestInner(requestId: string): Promise { try { const marker = JSON.parse(fs.readFileSync(markerFile, "utf8")) as { threadId?: string }; if (marker?.threadId && hasPrompt) { - await manager.sendPrompt({ threadId: marker.threadId, message: parsed.prompt }); + deliverSiriPrompt(marker.threadId, parsed.prompt as string, requestId); } fs.rmSync(file, { force: true }); fs.rmSync(markerFile, { force: true }); @@ -533,8 +533,8 @@ async function consumeSiriRequestInner(requestId: string): Promise { if (threadId) { fs.writeFileSync(markerFile, JSON.stringify({ threadId }), "utf8"); } - if (hasPrompt) { - await manager.sendPrompt({ threadId, message: parsed.prompt }); + if (threadId && hasPrompt) { + deliverSiriPrompt(threadId, parsed.prompt as string, requestId); } fs.rmSync(file, { force: true }); // Remove stale replicas in other dirs only after full success. @@ -553,6 +553,20 @@ async function consumeSiriRequestInner(requestId: string): Promise { return thread; } +/** + * Hand the prompt to the agent without awaiting the turn. `sendPrompt` only + * resolves when the agent finishes (up to ACP_PROMPT_TIMEOUT_MS), so awaiting + * it from the startup path blocked window creation until the agent was done. + * The thread already exists and is opened; a delivery failure is logged. + */ +function deliverSiriPrompt(threadId: string, message: string, requestId: string): void { + void requireAgentManager() + .sendPrompt({ threadId, message }) + .catch((err) => { + console.error(`[Main] Siri request ${requestId}: prompt delivery failed:`, err); + }); +} + async function openSiriThread(thread: unknown): Promise { const threadId = (thread as { id?: string })?.id; if (!threadId) return; @@ -568,9 +582,9 @@ async function openSiriThread(thread: unknown): Promise { /** * App Intents extensions cannot launch Electron directly. They leave a - * request in the shared directory and macOS opens the containing app because - * StartThreadIntent.openAppWhenRun is true. Consume the newest pending files - * whenever Pipper starts or is activated from Shortcuts. + * request in the shared directory and open `pipper://siri/`. Consume the + * pending files (oldest first) whenever Pipper starts or is activated from + * Shortcuts. Callers must not block window creation on this. */ async function consumePendingSiriRequests(): Promise { if (!agentManager) return; @@ -632,6 +646,19 @@ async function handlePipperDeepLink(url: string): Promise { return true; } +async function drainStartupSiriRequests(): Promise { + try { + await consumePendingSiriRequests(); + } catch (err) { + console.error("[Main] Failed to consume pending Siri requests at startup:", err); + } + for (const queued of pendingDeepLinks.splice(0)) { + await handlePipperDeepLink(queued).catch((err) => { + console.error("[Main] Failed to handle queued deep link:", err); + }); + } +} + function requireLauncherUpdateManager(): LauncherUpdateManager { if (!launcherUpdateManager) throw new Error("Launcher update manager is not initialized."); return launcherUpdateManager; @@ -2544,12 +2571,6 @@ app.whenReady().then(async () => { attention: { isFocused: () => mainWindowFocused }, notify: osNotifier, }); - await consumePendingSiriRequests(); - for (const queued of pendingDeepLinks.splice(0)) { - await handlePipperDeepLink(queued).catch((err) => { - console.error("[Main] Failed to handle queued deep link:", err); - }); - } sleeplessController = new SleeplessController({ platform: process.platform, settingsPath: join(app.getPath("userData"), "sleepless.json"), @@ -2668,6 +2689,11 @@ app.whenReady().then(async () => { } logStartupMilestone("main-window:starting-before-agent-activation"); void createMainWindow(); + // Siri/Shortcuts requests staged before launch (and deep links that + // arrived before the agent manager existed) are consumed only once the + // window is on its way up, and never awaited: consumption creates threads + // and talks to agents, which must not gate first paint. + void drainStartupSiriRequests(); if (state.projectId) { // ACP activation spawns and handshakes with child processes. It must not // overlap Chromium's renderer bootstrap or first paint. The renderer's diff --git a/electron/paths.ts b/electron/paths.ts index 09007d6..fb5c0a9 100644 --- a/electron/paths.ts +++ b/electron/paths.ts @@ -2,9 +2,6 @@ import { app } from "electron"; import { join } from "node:path"; import os from "node:os"; -/** Shared with the sandboxed App Intents extension on macOS. */ -export const PIPPER_APP_GROUP_IDENTIFIER = "group.com.maker-or.omni.pipper"; - /** Primary user-owned storage (ad-hoc-friendly, no Team ID required). */ export function getPipperSharedPath(): string { if (process.env.PIPPER_LIBRARY_PATH) return process.env.PIPPER_LIBRARY_PATH; diff --git a/electron/siri/siri-catalog.ts b/electron/siri/siri-catalog.ts index 38d8a5f..378cff6 100644 --- a/electron/siri/siri-catalog.ts +++ b/electron/siri/siri-catalog.ts @@ -2,7 +2,7 @@ import { mkdirSync, renameSync, writeFileSync } from "node:fs"; import { dirname, join } from "node:path"; import os from "node:os"; import { getSelectedAgentIds } from "../db.ts"; -import { getPipperLibraryPath, PIPPER_APP_GROUP_IDENTIFIER } from "../paths.ts"; +import { getPipperLibraryPath } from "../paths.ts"; import { listProjects } from "../projects.ts"; import { listRegisteredAgents, getDefaultAgentId } from "../agents/registry.ts"; @@ -26,19 +26,18 @@ export interface SiriCatalog { agents: SiriCatalogAgent[]; } -/** Every location the Swift extension may read from (ad-hoc: ~/Library/pipper). */ +/** + * Every location the Swift extension may read from. Must match + * `SiriCatalogStore.candidateDirs()` in native/pipper-intents. + */ export function getSiriLibraryDirs(): string[] { const dirs = [getPipperLibraryPath()]; if (process.env.PIPPER_LIBRARY_PATH) return dirs; - // Legacy Group Container fallback for users migrating from signed builds if (process.platform === "darwin") { - const legacy = join(os.homedir(), "Library/Group Containers", PIPPER_APP_GROUP_IDENTIFIER); - if (legacy !== dirs[0]) dirs.push(legacy); - // Also probe Application Support/Pipper for future share const appSupport = join(os.homedir(), "Library/Application Support/Pipper"); if (appSupport !== dirs[0]) dirs.push(appSupport); } - return [...new Set(dirs)]; + return dirs; } export function getSiriCatalogPath(): string { return join(getPipperLibraryPath(), "siri-catalog.json"); @@ -88,8 +87,7 @@ export function buildSiriCatalog(): SiriCatalog { export function refreshSiriCatalog(): SiriCatalog { const catalog = buildSiriCatalog(); const payload = JSON.stringify(catalog, null, 2); - // Dual-write so the ad-hoc-signed extension finds the catalog whether it - // resolves the App Group container or falls back to ~/Library/pipper. + // Dual-write so the extension finds the catalog in either sandboxed path. for (const dir of getSiriLibraryDirs()) { try { mkdirSync(dir, { recursive: true }); @@ -99,8 +97,6 @@ export function refreshSiriCatalog(): SiriCatalog { writeFileSync(tmp, payload, "utf8"); renameSync(tmp, target); } catch (err) { - // Ad-hoc-signed builds cannot create the App Group container; the - // legacy ~/Library/pipper location must still be updated. console.warn(`[Siri] Catalog write failed for ${dir}:`, err); } } diff --git a/native/pipper-intents/README.md b/native/pipper-intents/README.md index 4a16a32..aa8f922 100644 --- a/native/pipper-intents/README.md +++ b/native/pipper-intents/README.md @@ -1,16 +1,17 @@ # PipperIntents (Siri / Shortcuts) -Swift Package providing the Siri entry point for Pipper: `StartThreadIntent` -plus `ProjectEntity` / `AgentEntity` backed by the shared App Group catalog in -`group.com.maker-or.omni.pipper` (written by Electron, see +Swift Package providing the Siri / Shortcuts / Spotlight entry point for +Pipper: `StartThreadIntent` with Project / Agent pickers backed by the shared +catalog `siri-catalog.json` (written by Electron, see `electron/siri/siri-catalog.ts`). -Flow: the intent stages a request in -`~/Library/Group Containers/group.com.maker-or.omni.pipper/siri-requests/.json` -and asks macOS to open Pipper. Electron consumes the pending request during -startup or activation, creates the thread, delivers the prompt, and lands on -it. The App Group is required because macOS runs App Intents extensions in the -App Sandbox. +Flow: the intent stages a request in `siri-requests/.json` under both +`~/Library/pipper/` and `~/Library/Application Support/Pipper/`, then opens +`pipper://siri/`. Electron consumes the pending request during startup, +activation, or the deep link; creates the thread; hands off the prompt; and +lands on it. macOS runs App Intents extensions in the App Sandbox, and ad-hoc +builds have no Team ID for App Groups, so the extension reaches those two +directories via `temporary-exception.files.home-relative-path` entitlements. ## Packaging diff --git a/native/pipper-intents/Sources/PipperIntents.swift b/native/pipper-intents/Sources/PipperIntents.swift index 28ee026..30291a0 100644 --- a/native/pipper-intents/Sources/PipperIntents.swift +++ b/native/pipper-intents/Sources/PipperIntents.swift @@ -57,10 +57,6 @@ struct SiriCatalog: Codable, Sendable { } enum SiriCatalogStore { - /// App Intents extensions must run in the App Sandbox. The containing - /// Electron app and this extension share the catalog through this group. - static let appGroupIdentifier = "group.com.maker-or.omni.pipper" - /// The Xcode preview host has no Electron process to populate the live /// catalog. Keep its metadata/action preview useful without exposing these /// sample entities in the packaged app. @@ -78,9 +74,9 @@ enum SiriCatalogStore { return FileManager.default.homeDirectoryForCurrentUser } - /// Ad-hoc builds have no Team ID, so App Group containers are denied. - /// Primary is ~/Library/pipper (temporary-exception), with Group Container - /// as legacy fallback for users migrating from signed builds. + /// Ad-hoc builds have no Team ID, so App Group containers are denied; the + /// extension reaches these home-relative paths via temporary-exception + /// entitlements instead. Primary is ~/Library/pipper. static func candidateDirs() -> [URL] { if let overridePath = ProcessInfo.processInfo.environment["PIPPER_LIBRARY_PATH"], !overridePath.isEmpty @@ -93,14 +89,7 @@ enum SiriCatalogStore { home.appendingPathComponent("Library/pipper", isDirectory: true)) dirs.append( home.appendingPathComponent("Library/Application Support/Pipper", isDirectory: true)) - if let groupURL = FileManager.default.containerURL( - forSecurityApplicationGroupIdentifier: appGroupIdentifier - ) { - dirs.append(groupURL) - } - // Deduplicate while preserving order. - var seen = Set() - return dirs.filter { seen.insert($0.path).inserted } + return dirs } static func baseDir() -> URL { @@ -233,11 +222,20 @@ static var isDiscoverable: Bool = true @Parameter(title: "Project", description: "name of the project to run the agent in", optionsProvider: ProjectOptionsProvider()) var projectId: String @Parameter(title: "Agent", description: "the agent to run", optionsProvider: AgentOptionsProvider()) var agentId: String - @Parameter(title: "Task",description: "what action or a task in perform in a project with an agent", requestValueDialog: "What should the thread work on?") var prompt: String? + // Required (not `String?`): App Intents only asks for required parameters, + // so an optional task was silently skipped when run from Spotlight/Siri. + @Parameter(title: "Task", description: "what action or a task to perform in a project with an agent", requestValueDialog: "What should the thread work on?") var prompt: String + + // Spotlight (macOS 26+) renders this sentence inline in the search bar with + // each parameter as a fillable token, like Mail's "Send [Message] with + // [Subject] to [Recipients]". Free text goes first so the cursor lands there. + static var parameterSummary: some ParameterSummary { + Summary("Start \(\.$prompt) in \(\.$projectId) with \(\.$agentId)") + } func perform() async throws -> some IntentResult & ProvidesDialog { Self.debugLog("perform entered") - Self.debugLog("perform start projectId=\(projectId) agentId=\(agentId) promptLen=\(prompt?.count ?? 0)") + Self.debugLog("perform start projectId=\(projectId) agentId=\(agentId) promptLen=\(prompt.count)") Self.debugLog("candidateDirs=\(SiriCatalogStore.candidateDirs().map { $0.path })") let catalog = SiriCatalogStore.load() Self.debugLog("catalog loaded: projects=\(catalog?.projects.count ?? -1) agents=\(catalog?.agents.count ?? -1)") @@ -266,12 +264,12 @@ static var isDiscoverable: Bool = true "requestId": requestId, "projectId": projectId, "agentId": agentId, - "prompt": prompt ?? "", + "prompt": prompt, ] let dir = SiriCatalogStore.baseDir().appendingPathComponent("siri-requests", isDirectory: true) // Stage into every candidate dir so Electron finds the request no - // matter which location it consumes from. One location failing (e.g. - //Sandbox denying the group container) must not fail the whole intent. + // matter which location it consumes from. One location failing must + // not fail the whole intent. var stagedCount = 0 var lastError: Error? for base in SiriCatalogStore.candidateDirs() { diff --git a/spotlight.md b/spotlight.md new file mode 100644 index 0000000..fff08da --- /dev/null +++ b/spotlight.md @@ -0,0 +1,76 @@ +# Spotlight support for Pipper App Intents + +## Goal + +Make Pipper projects/agents searchable in macOS Spotlight (and resolvable by Siri / Apple Intelligence). Results are display-only in v1 (no tap-to-open — see Non-goals). Thread creation stays on the existing `siri-requests/` + `pipper://siri/` handoff. + +## Background + +- Today `native/pipper-intents/Sources/PipperIntents.swift` uses `String` IDs + `DynamicOptionsProvider` for `StartThreadIntent`, deliberately avoiding `AppEntity` (pre-`perform` decode failed with `LNPerformActionErrorCodeUnsupportedValueType`). +- Electron writes `siri-catalog.json` (`electron/siri/siri-catalog.ts`) to `~/Library/pipper/`, App Support, and App Group container; the extension reads it via `SiriCatalogStore`. +- Apple path (per docs): `AppEntity` → `IndexedEntity` → donate via `CSSearchableIndex.indexAppEntities` → `IndexedEntityQuery` for reindexing. (`OpenIntent` for tap-to-open is deliberately out of scope — see Non-goals.) + +## Work items + +### 1. `ProjectEntity` / `AgentEntity` as `IndexedEntity` + +- File: `native/pipper-intents/Sources/PipperIntents.swift` (new section; keep String-ID providers as fallback until proven). +- `struct ProjectEntity: IndexedEntity, Codable, Sendable`: + - `id: String` (catalog project id), `@Property(title: "Name") name: String` + - `@ComputedProperty(indexingKey: \.contentDescription) path` + - optional custom key for project id: `CSCustomAttributeKey(keyName: "com.maker-or.omni.pipper.project.id")` + - `displayRepresentation`: title=name, subtitle=path + - `attributeSet` only if extra data needed later. +- `struct AgentEntity: IndexedEntity`: `id`, `@Property displayName`, displayRepresentation. +- Queries: `ProjectQuery: IndexedEntityQuery`, `AgentQuery: IndexedEntityQuery` reading `SiriCatalogStore.load()`: + - `entities(for:)` — filter catalog by ids + - `suggestedEntities()` — all projects / available agents + - `reindexEntities(for:indexDescription:)` + `reindexAllEntities(indexDescription:)` — re-donate via named `CSSearchableIndex`. +- Risk: re-trigger of the `AppEntity` decode crash. Mitigate: keep `StartThreadIntent` on Strings in parallel; add one bisect intent with entity param first. + +### 2. Migrate `StartThreadIntent` params to entities + +- Change `@Parameter projectId/agentId: String` → `@Parameter project: ProjectEntity`, `agent: AgentEntity` (keep `prompt: String?`). +- `perform()`: validate `available`, stage `{requestId, projectId: project.id, agentId: agent.id, prompt}` to every `candidateDirs()/siri-requests` (existing logic), return `opensIntent: OpenURLIntent(pipper://siri/)` on macOS 15.2+. +- Keep old String-ID intent (renamed, `isDiscoverable=false`) until entity path ships reliably on ad-hoc-signed builds. + +### 3. Donation to Spotlight index + +- Named index, e.g. `CSSearchableIndex(name: "com.maker-or.omni.pipper.projects")` (never default index). +- Donate after catalog load: `try await index.indexAppEntities(projectEntities)` (+ agents index or same index). Entity `id` dedupes/updates. +- Where: inside `suggestedEntities()`/reindex methods + explicit donate call from a new `DonateCatalogIntent` (for Shortcuts/testing) or from Electron-triggered refresh. Extension sandbox can only read `~/Library/pipper/` etc. — no SQLite access. +- Deletion: `deleteAppEntities(withIdentifiers:)` for projects removed from catalog (compute diff or wipe+reindex on catalog version change). + +### 4. Electron changes + +- `electron/siri/`: no catalog format change required. Log donation visibility for debugging (`intents-debug.log` already exists). +- Consider triggering donation refresh after `refreshSiriCatalog()` (can't call Spotlight from Electron directly — needs Swift helper binary or rely on extension-side donation on next query/reindex). + +### 5. Build / signing / entitlements + +- `Extension/PipperIntents.entitlements`: Spotlight/CoreSpotlight needs no extra entitlement for `indexAppEntities` from extension; verify ad-hoc-signed builds can write the named index. +- `scripts/build.js` + `electron-builder.yml`: no change expected (extension already embedded); confirm `Metadata.appintents` regenerates with new entities. +- Preview app: add sample projects/agents for metadata inspection (existing Demo Project pattern). + +### 6. Tests + +- Extend `Tests/PipperIntentsTests/`: entity encode/decode round-trip, `entities(for:)` filtering, staging payload uses `entity.id`, reindex methods donate without throw (mock index or `#if` gate). +- Manual: donate → Spotlight search project name → result appears with correct title/subtitle. Verify Siri phrase still resolves entity ("start a thread in FolkLore with Codex"). Verify reindex after catalog refresh. + +## Order + +1. Entities + queries + bisect intent (no behavior change). +2. Donation + reindex. +3. Migrate `StartThreadIntent` to entities, keep String fallback. +4. Tests + manual Spotlight/Siri verification + remove fallback. + +## Non-goals (v1) + +- **No `OpenIntent` / tap-to-open.** `OpenIntent` defaults to `openAppWhenRun = true`, which relies on the App Intents host-app launch handshake that fails on ad-hoc-signed builds (same reason `StartThreadIntent.openAppWhenRun` is false). Spotlight results are therefore display-only: tapping a project does not navigate into Pipper. Revisit if/when builds are Developer ID-signed. +- No `ShowInAppSearchResultsIntent`. + +## Open questions + +- Root cause of prior `AppEntity` pre-`perform` decode failure — retest with minimal entity before full migration. +- Whether ad-hoc-signed (no Team ID) extensions can donate to named Spotlight index; fallback is signed-build-only Spotlight. +- Donation trigger cadence (on query vs. explicit refresh) given extension has no background runtime. From baa3fe509b5be63a5235b6f29d21dd0951b8e954 Mon Sep 17 00:00:00 2001 From: Harshith Pasupuleti Date: Fri, 11 Sep 2026 14:23:05 +0530 Subject: [PATCH 15/22] Set version to 0.0.23 Co-Authored-By: Claude Opus 5 (1M context) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3db38bc..1e9df56 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pipper-code-alpha", - "version": "0.0.31", + "version": "0.0.23", "private": true, "type": "module", "main": "out/main/index.js", From a77ed0e8a91f53bf05e1aabdffec98692e2190c1 Mon Sep 17 00:00:00 2001 From: Harshith Pasupuleti Date: Fri, 11 Sep 2026 16:46:20 +0530 Subject: [PATCH 16/22] Use human-readable labels for Siri intent option values --- .../Sources/PipperIntents.swift | 71 ++++++++++++++----- .../PipperIntentsTests.swift | 39 ++++++++-- 2 files changed, 87 insertions(+), 23 deletions(-) diff --git a/native/pipper-intents/Sources/PipperIntents.swift b/native/pipper-intents/Sources/PipperIntents.swift index 30291a0..7563e95 100644 --- a/native/pipper-intents/Sources/PipperIntents.swift +++ b/native/pipper-intents/Sources/PipperIntents.swift @@ -149,9 +149,39 @@ enum SiriCatalogStore { } } -// MARK: - Options (String IDs + pickers; AppEntity decoding fails pre-perform, see intents-debug.log LNPerformActionErrorCodeUnsupportedValueType) -// decoding a saved AppEntity value before perform(). These providers retain -// the same named pickers while passing the stable catalog IDs as Strings. +// MARK: - Options (String values + pickers) +// +// AppEntity parameters fail to decode before perform() on ad-hoc builds +// (LNPerformActionErrorCodeUnsupportedValueType), so parameters are Strings +// with DynamicOptionsProviders. Spotlight renders the raw String value and +// ignores IntentItem titles, so the value must be the human-readable label; +// perform() resolves it back to the catalog id. Raw ids are still accepted +// so Shortcuts saved before this change keep working. + +enum SiriCatalogLabels { + /// Project label: the name, disambiguated with the path when two projects + /// share a name. + static func projectLabel(_ project: SiriCatalogProject, in all: [SiriCatalogProject]) -> String { + let duplicates = all.filter { $0.name == project.name }.count > 1 + return duplicates ? "\(project.name) (\(project.path))" : project.name + } + + static func resolveProject(_ value: String, in all: [SiriCatalogProject]) -> SiriCatalogProject? { + if let byId = all.first(where: { $0.id == value }) { return byId } + return all.first(where: { projectLabel($0, in: all) == value }) + } + + static func agentLabel(_ agent: SiriCatalogAgent, in all: [SiriCatalogAgent]) -> String { + let duplicates = all.filter { $0.displayName == agent.displayName }.count > 1 + return duplicates ? "\(agent.displayName) (\(agent.id))" : agent.displayName + } + + static func resolveAgent(_ value: String, in all: [SiriCatalogAgent]) -> SiriCatalogAgent? { + if let byId = all.first(where: { $0.id == value }) { return byId } + return all.first(where: { agentLabel($0, in: all) == value }) + } +} + struct ProjectOptionsProvider: DynamicOptionsProvider { typealias Result = IntentItemCollection typealias DefaultValue = String @@ -160,9 +190,10 @@ struct ProjectOptionsProvider: DynamicOptionsProvider { let projects = SiriCatalogStore.load()?.projects ?? [] let items = projects.map { IntentItem( - $0.id, + SiriCatalogLabels.projectLabel($0, in: projects), title: LocalizedStringResource(stringLiteral: $0.name), - subtitle: LocalizedStringResource(stringLiteral: $0.path) + subtitle: LocalizedStringResource(stringLiteral: $0.path), + image: .init(systemName: "folder") ) } return IntentItemCollection(sections: [IntentItemSection(items: items)]) @@ -177,8 +208,9 @@ struct AgentOptionsProvider: DynamicOptionsProvider { let agents = SiriCatalogStore.load()?.agents.filter(\.available) ?? [] let items = agents.map { IntentItem( - $0.id, - title: LocalizedStringResource(stringLiteral: $0.displayName) + SiriCatalogLabels.agentLabel($0, in: agents), + title: LocalizedStringResource(stringLiteral: $0.displayName), + image: .init(systemName: "cpu") ) } return IntentItemCollection(sections: [IntentItemSection(items: items)]) @@ -239,19 +271,22 @@ static var isDiscoverable: Bool = true Self.debugLog("candidateDirs=\(SiriCatalogStore.candidateDirs().map { $0.path })") let catalog = SiriCatalogStore.load() Self.debugLog("catalog loaded: projects=\(catalog?.projects.count ?? -1) agents=\(catalog?.agents.count ?? -1)") - guard let chosenProject = catalog?.projects.first(where: { $0.id == projectId }) else { - Self.debugLog("perform rejected projectId=\(projectId) reason=unavailable") + guard + let chosenProject = SiriCatalogLabels.resolveProject(projectId, in: catalog?.projects ?? []) + else { + Self.debugLog("perform rejected project=\(projectId) reason=unavailable") throw SiriRequestError.projectUnavailable(projectId) } // Revalidate availability at run time: the catalog may have changed - // between entity resolution and perform(). - let usableIds = Set((catalog?.agents ?? []).filter { $0.available }.map { $0.id }) - guard usableIds.contains(agentId) else { - let agentName = catalog?.agents.first(where: { $0.id == agentId })?.displayName ?? agentId - Self.debugLog("perform rejected agentId=\(agentId) reason=unavailable") + // between picking and perform(). + let agents = catalog?.agents ?? [] + guard let chosenAgent = SiriCatalogLabels.resolveAgent(agentId, in: agents), chosenAgent.available + else { + let agentName = SiriCatalogLabels.resolveAgent(agentId, in: agents)?.displayName ?? agentId + Self.debugLog("perform rejected agent=\(agentId) reason=unavailable") throw SiriRequestError.agentUnavailable(agentName) } - Self.debugLog("perform validation passed agentId=\(agentId)") + Self.debugLog("perform validation passed projectId=\(chosenProject.id) agentId=\(chosenAgent.id)") if SiriCatalogStore.isPreviewExtension { return .result( dialog: "Preview: would start a thread in \(chosenProject.name)." @@ -262,11 +297,10 @@ static var isDiscoverable: Bool = true let requestId = UUID().uuidString let payload: [String: String] = [ "requestId": requestId, - "projectId": projectId, - "agentId": agentId, + "projectId": chosenProject.id, + "agentId": chosenAgent.id, "prompt": prompt, ] - let dir = SiriCatalogStore.baseDir().appendingPathComponent("siri-requests", isDirectory: true) // Stage into every candidate dir so Electron finds the request no // matter which location it consumes from. One location failing must // not fail the whole intent. @@ -289,7 +323,6 @@ static var isDiscoverable: Bool = true } } Self.debugLog("stagedCount=\(stagedCount) lastError=\(String(describing: lastError))") - _ = dir if stagedCount == 0 { if let siriError = lastError as? SiriRequestError { throw siriError diff --git a/native/pipper-intents/Tests/PipperIntentsTests/PipperIntentsTests.swift b/native/pipper-intents/Tests/PipperIntentsTests/PipperIntentsTests.swift index e5f7dd7..1a33d2b 100644 --- a/native/pipper-intents/Tests/PipperIntentsTests/PipperIntentsTests.swift +++ b/native/pipper-intents/Tests/PipperIntentsTests/PipperIntentsTests.swift @@ -27,6 +27,20 @@ struct PipperIntentsTests { try await withTempCatalog(catalog) { let items = try await ProjectOptionsProvider().results() #expect(items.sections.first?.items.count == 2) + // Spotlight shows the raw value, so it must be the project name. + #expect(items.sections.first?.items.map(\.value) == ["My App", "Other"]) + } + } + + @Test func projectOptionsDisambiguateDuplicateNames() async throws { + let catalog = makeCatalog(projects: [ + SiriCatalogProject(id: "p1", name: "app", path: "/tmp/a"), + SiriCatalogProject(id: "p2", name: "app", path: "/tmp/b"), + ]) + try await withTempCatalog(catalog) { + let values = try await ProjectOptionsProvider().results().sections.first?.items.map(\.value) + #expect(values == ["app (/tmp/a)", "app (/tmp/b)"]) + #expect(SiriCatalogLabels.resolveProject("app (/tmp/b)", in: catalog.projects)?.id == "p2") } } @@ -38,6 +52,7 @@ struct PipperIntentsTests { try await withTempCatalog(catalog) { let items = try await AgentOptionsProvider().results() #expect(items.sections.first?.items.count == 1) + #expect(items.sections.first?.items.first?.value == "Codex") } } @@ -48,9 +63,10 @@ struct PipperIntentsTests { defaultAgentId: "codex-acp" ) try await withTempCatalog(catalog) { - let intent = StartThreadIntent() - intent.projectId = "p1" - intent.agentId = "codex-acp" + let intent = StartThreadIntent() + // Picker values are labels; the staged payload must carry catalog ids. + intent.projectId = "My App" + intent.agentId = "Codex" intent.prompt = "Fix login bug" let result = try await intent.perform() // Verify file staged @@ -66,7 +82,7 @@ struct PipperIntentsTests { } } - @Test func startThreadIntentRequiresAndStagesChosenAgent() async throws { + @Test func startThreadIntentStillAcceptsRawIds() async throws { let catalog = makeCatalog( projects: [SiriCatalogProject(id: "p1", name: "My App", path: "/tmp/a")], agents: [SiriCatalogAgent(id: "codex-acp", displayName: "Codex", available: true)], @@ -81,9 +97,24 @@ struct PipperIntentsTests { let dir = URL(fileURLWithPath: ProcessInfo.processInfo.environment["PIPPER_LIBRARY_PATH"]!) let file = try FileManager.default.contentsOfDirectory(at: dir.appendingPathComponent("siri-requests"), includingPropertiesForKeys: nil).first! let json = try JSONSerialization.jsonObject(with: Data(contentsOf: file)) as! [String: String] + #expect(json["projectId"] == "p1") #expect(json["agentId"] == "codex-acp") } } + + @Test func startThreadIntentRejectsUnavailableAgent() async throws { + let catalog = makeCatalog( + projects: [SiriCatalogProject(id: "p1", name: "My App", path: "/tmp/a")], + agents: [SiriCatalogAgent(id: "opencode-acp", displayName: "opencode", available: false)] + ) + try await withTempCatalog(catalog) { + let intent = StartThreadIntent() + intent.projectId = "My App" + intent.agentId = "opencode" + intent.prompt = "x" + await #expect(throws: SiriRequestError.self) { try await intent.perform() } + } + } } extension PipperIntentsTests { From dc0999cdf6e4e788ad253f674bd01d6593c5d813 Mon Sep 17 00:00:00 2001 From: Harshith Pasupuleti Date: Sun, 13 Sep 2026 13:41:07 +0530 Subject: [PATCH 17/22] Add Siri-first iOS companion app (PipperRemote) over the Tailscale remote Native SwiftUI app that talks to the laptop's RemoteServer with the same bearer-token pairing as the phone PWA, built around App Intents so "Start a Pipper thread in " creates a worktree + thread on the Mac without opening the app. Laptop: - GET /api/remote/catalog serves buildSiriCatalog() (same shape as the macOS siri-catalog.json) so the phone caches an identical project/agent catalog for offline Siri parameter resolution. Covered by remote-server.test.ts. - bun run dev prints the Host/Port/Token fields the iOS pairing form needs. iOS (native/pipper-remote-ios): - PipperRemoteCore (Foundation-only, swift test): wire models, pairing URL parsing, on-disk catalog cache, HTTP client. - App: pairing (QR or manual, tolerant host:port input), thread list/detail with sticky-bottom scrolling, settings; RemoteSession keeps the token in the Keychain. Intents run in-process so no App Group is needed. - Intents: ProjectEntity/AgentEntity as AppEntity + EntityStringQuery, StartThreadIntent (agent optional -> Mac default), CheckMacIntent, and App Shortcut phrases (one entity per phrase, per App Shortcuts rules). - Simulator builds are re-signed with an Apple Development identity: an ad-hoc bundle has no Team ID, App Intents then cannot register AppEntity types and every entity parameter arrives nil (LNContextErrorDomain 2004), the same failure the ad-hoc macOS extension hit. scripts/run-simulator.sh builds, re-signs, installs, and launches. Co-Authored-By: Claude Opus 5 (1M context) --- .gitignore | 1 + electron/main.ts | 9 + electron/remote-server.test.ts | 109 ++++++ electron/remote-server.ts | 9 + native/pipper-remote-ios/App/Info.plist | 62 +++ .../App/Intents/CatalogEntities.swift | 85 +++++ .../App/Intents/PipperRemoteShortcuts.swift | 37 ++ .../App/Intents/StartThreadIntent.swift | 115 ++++++ native/pipper-remote-ios/App/Keychain.swift | 45 +++ .../App/PipperRemoteApp.swift | 37 ++ .../pipper-remote-ios/App/RemoteSession.swift | 102 +++++ .../App/Views/PairingView.swift | 119 ++++++ .../App/Views/QRScannerSheet.swift | 114 ++++++ .../App/Views/SettingsView.swift | 97 +++++ .../App/Views/ThreadDetailView.swift | 232 +++++++++++ .../App/Views/ThreadListView.swift | 198 ++++++++++ native/pipper-remote-ios/Package.swift | 21 + .../PipperRemote.xcodeproj/project.pbxproj | 360 ++++++++++++++++++ native/pipper-remote-ios/README.md | 95 +++++ .../PipperRemoteCore/CatalogStore.swift | 43 +++ .../PipperRemoteCore/RemoteClient.swift | 146 +++++++ .../PipperRemoteCore/RemoteConfig.swift | 74 ++++ .../PipperRemoteCore/RemoteModels.swift | 146 +++++++ .../PipperRemoteCoreTests.swift | 229 +++++++++++ .../scripts/run-simulator.sh | 34 ++ .../scripts/sign-simulator.sh | 27 ++ 26 files changed, 2546 insertions(+) create mode 100644 electron/remote-server.test.ts create mode 100644 native/pipper-remote-ios/App/Info.plist create mode 100644 native/pipper-remote-ios/App/Intents/CatalogEntities.swift create mode 100644 native/pipper-remote-ios/App/Intents/PipperRemoteShortcuts.swift create mode 100644 native/pipper-remote-ios/App/Intents/StartThreadIntent.swift create mode 100644 native/pipper-remote-ios/App/Keychain.swift create mode 100644 native/pipper-remote-ios/App/PipperRemoteApp.swift create mode 100644 native/pipper-remote-ios/App/RemoteSession.swift create mode 100644 native/pipper-remote-ios/App/Views/PairingView.swift create mode 100644 native/pipper-remote-ios/App/Views/QRScannerSheet.swift create mode 100644 native/pipper-remote-ios/App/Views/SettingsView.swift create mode 100644 native/pipper-remote-ios/App/Views/ThreadDetailView.swift create mode 100644 native/pipper-remote-ios/App/Views/ThreadListView.swift create mode 100644 native/pipper-remote-ios/Package.swift create mode 100644 native/pipper-remote-ios/PipperRemote.xcodeproj/project.pbxproj create mode 100644 native/pipper-remote-ios/README.md create mode 100644 native/pipper-remote-ios/Sources/PipperRemoteCore/CatalogStore.swift create mode 100644 native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteClient.swift create mode 100644 native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteConfig.swift create mode 100644 native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteModels.swift create mode 100644 native/pipper-remote-ios/Tests/PipperRemoteCoreTests/PipperRemoteCoreTests.swift create mode 100755 native/pipper-remote-ios/scripts/run-simulator.sh create mode 100755 native/pipper-remote-ios/scripts/sign-simulator.sh diff --git a/.gitignore b/.gitignore index e6c35b0..61f77fd 100644 --- a/.gitignore +++ b/.gitignore @@ -54,6 +54,7 @@ DerivedData/ native/pipper-intents/PreviewApp/build/ native/pipper-intents/preview-dist/ native/pipper-intents/PreviewApp/native/ +native/pipper-remote-ios/build/ .swiftpm/ # Local script output diff --git a/electron/main.ts b/electron/main.ts index 3adea82..5743875 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -2614,6 +2614,15 @@ app.whenReady().then(async () => { console.log( `\x1b[32m[Remote] PWA: http://${tailscale}:${remoteServer.port}/remote token: ${remoteServer.getPairingToken()}\x1b[0m`, ); + // The iOS app's manual pairing form has exactly these three fields. + console.log( + [ + "\x1b[32m[Remote] iOS app → Pair with your Mac (enter manually):\x1b[0m", + `\x1b[32m Host: ${tailscale}\x1b[0m`, + `\x1b[32m Port: ${remoteServer.port}\x1b[0m`, + `\x1b[32m Token: ${remoteServer.getPairingToken()}\x1b[0m`, + ].join("\n"), + ); try { const { default: qrcode } = await import("qrcode-terminal"); console.log("\x1b[32m[Remote] Scan to pair (opens link + auto-connects):\x1b[0m"); diff --git a/electron/remote-server.test.ts b/electron/remote-server.test.ts new file mode 100644 index 0000000..b98cd3d --- /dev/null +++ b/electron/remote-server.test.ts @@ -0,0 +1,109 @@ +import { mkdtempSync, rmSync } from "node:fs"; +import { tmpdir } from "node:os"; +import { join } from "node:path"; +import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; + +// The remote server reaches into SQLite-backed modules; stub them so the test +// exercises the HTTP contract the phone apps depend on, not the database. +const catalog = { + version: 1 as const, + updatedAt: "2026-09-13T00:00:00.000Z", + defaultAgentId: "codex-acp", + projects: [{ id: "p1", name: "FolkLore", path: "/tmp/folklore" }], + agents: [ + { id: "codex-acp", displayName: "Codex", available: true }, + { id: "opencode-acp", displayName: "opencode", available: false }, + ], +}; + +vi.mock("./siri/siri-catalog.ts", () => ({ buildSiriCatalog: () => catalog })); +vi.mock("./projects.ts", () => ({ + listProjects: () => catalog.projects, + getProject: (id: string) => catalog.projects.find((p) => p.id === id) ?? null, +})); +vi.mock("./agents/registry.ts", () => ({ + listRegisteredAgents: () => catalog.agents.map((a) => ({ id: a.id, displayName: a.displayName })), +})); +vi.mock("./threads.ts", () => ({ listThreads: () => [], getThread: () => null })); +vi.mock("./worktree-manager.ts", () => ({ + createWorktree: () => { + throw new Error("not in test"); + }, + removeWorktree: () => {}, + gitBinary: () => "git", +})); + +import { RemoteServer } from "./remote-server.ts"; + +let userData: string; +let server: RemoteServer; +let base: string; + +beforeEach(async () => { + userData = mkdtempSync(join(tmpdir(), "pipper-remote-test-")); + server = new RemoteServer( + { + agentManager: () => null, + getUserDataPath: () => userData, + getRendererDir: () => userData, + }, + { port: 0, token: "test-token" }, + ); + // Bind loopback on an ephemeral port; read the real port back from the socket. + process.env.PIPPER_REMOTE_HOST = "127.0.0.1"; + server.start(); + const bound = await new Promise((resolve) => { + const s = (server as unknown as { servers: import("node:http").Server[] }).servers[0]!; + s.once("listening", () => resolve((s.address() as { port: number }).port)); + }); + base = `http://127.0.0.1:${bound}`; +}); + +afterEach(async () => { + delete process.env.PIPPER_REMOTE_HOST; + await server.stop(); + rmSync(userData, { recursive: true, force: true }); +}); + +describe("GET /api/remote/catalog", () => { + it("requires the pairing token", async () => { + const res = await fetch(`${base}/api/remote/catalog`); + expect(res.status).toBe(401); + }); + + it("returns the same catalog Siri reads on the Mac, uncached", async () => { + const res = await fetch(`${base}/api/remote/catalog`, { + headers: { Authorization: "Bearer test-token" }, + }); + expect(res.status).toBe(200); + expect(res.headers.get("cache-control")).toBe("no-store"); + await expect(res.json()).resolves.toEqual(catalog); + }); + + it("is a live paired-phone signal for standby", async () => { + const seen: boolean[] = []; + const s = new RemoteServer( + { + agentManager: () => null, + getUserDataPath: () => userData, + getRendererDir: () => userData, + onRemoteActiveChanged: (active) => seen.push(active), + }, + { port: 0, token: "t2" }, + ); + s.start(); + const port = await new Promise((resolve) => { + const h = (s as unknown as { servers: import("node:http").Server[] }).servers[0]!; + h.once("listening", () => resolve((h.address() as { port: number }).port)); + }); + try { + await fetch(`http://127.0.0.1:${port}/api/remote/catalog`, { + headers: { Authorization: "Bearer t2" }, + }); + expect(seen).toContain(true); + expect(s.hasLiveLease()).toBe(true); + } finally { + await s.stop(); + } + }); +}); diff --git a/electron/remote-server.ts b/electron/remote-server.ts index 3042a23..503c184 100644 --- a/electron/remote-server.ts +++ b/electron/remote-server.ts @@ -8,6 +8,7 @@ import { join } from "node:path"; import type { AgentManager } from "./agent-connection-manager.ts"; import { listProjects, getProject } from "./projects.ts"; import { listRegisteredAgents } from "./agents/registry.ts"; +import { buildSiriCatalog } from "./siri/siri-catalog.ts"; import { getThread, listThreads } from "./threads.ts"; import { createWorktree, gitBinary, removeWorktree } from "./worktree-manager.ts"; import type { @@ -337,6 +338,14 @@ export class RemoteServer { })); return send(res, 200, { models }); } + if (req.method === "GET" && path === "/api/remote/catalog") { + // Same shape as siri-catalog.json on the laptop, so the iOS app's + // Siri intents resolve projects/agents against an identical catalog + // (selected agents only, with availability) without a network hop. + return send(res, 200, buildSiriCatalog(), "application/json", { + "Cache-Control": "no-store", + }); + } if (req.method === "GET" && path === "/api/remote/threads") { const running = new Set(am?.getRunningThreadIds() ?? []); const summaries: RemoteThreadSummary[] = listThreads() diff --git a/native/pipper-remote-ios/App/Info.plist b/native/pipper-remote-ios/App/Info.plist new file mode 100644 index 0000000..2b838fa --- /dev/null +++ b/native/pipper-remote-ios/App/Info.plist @@ -0,0 +1,62 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + $(EXECUTABLE_NAME) + + CFBundleDisplayName + Pipper + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(MARKETING_VERSION) + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + LSRequiresIPhoneOS + + UILaunchScreen + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + NSCameraUsageDescription + Scan the pairing QR code shown by Pipper on your Mac. + + NSAppTransportSecurity + + NSAllowsArbitraryLoads + + + CFBundleURLTypes + + + CFBundleURLName + com.maker-or.omni.remote + CFBundleURLSchemes + + pipper-remote + + + + + diff --git a/native/pipper-remote-ios/App/Intents/CatalogEntities.swift b/native/pipper-remote-ios/App/Intents/CatalogEntities.swift new file mode 100644 index 0000000..b541bf6 --- /dev/null +++ b/native/pipper-remote-ios/App/Intents/CatalogEntities.swift @@ -0,0 +1,85 @@ +import AppIntents +import Foundation + +/// Reads the catalog for Siri parameter resolution. Cached copy first (must +/// work offline and fast); falls back to a network fetch only when the cache +/// is empty, so a fresh install still works right after pairing. +enum IntentCatalog { + static func current() async -> RemoteCatalog { + let session = await MainActor.run { RemoteSession.shared } + let cached = await MainActor.run { session.catalog } + if !cached.projects.isEmpty { return cached } + return await session.refreshCatalog() ?? cached + } +} + +struct ProjectEntity: AppEntity { + static var typeDisplayRepresentation: TypeDisplayRepresentation = "Project" + static var defaultQuery = ProjectQuery() + + var id: String + var name: String + var path: String + + var displayRepresentation: DisplayRepresentation { + DisplayRepresentation( + title: "\(name)", + subtitle: "\(path)", + image: .init(systemName: "folder")) + } + + init(_ project: RemoteCatalogProject) { + id = project.id + name = project.name + path = project.path + } +} + +struct ProjectQuery: EntityStringQuery { + func entities(for identifiers: [String]) async throws -> [ProjectEntity] { + let catalog = await IntentCatalog.current() + return identifiers.compactMap { catalog.project(id: $0) }.map(ProjectEntity.init) + } + + func entities(matching string: String) async throws -> [ProjectEntity] { + await IntentCatalog.current().projects(matching: string).map(ProjectEntity.init) + } + + func suggestedEntities() async throws -> [ProjectEntity] { + await IntentCatalog.current().projects.map(ProjectEntity.init) + } +} + +struct AgentEntity: AppEntity { + static var typeDisplayRepresentation: TypeDisplayRepresentation = "Agent" + static var defaultQuery = AgentQuery() + + var id: String + var displayName: String + + var displayRepresentation: DisplayRepresentation { + DisplayRepresentation(title: "\(displayName)", image: .init(systemName: "cpu")) + } + + init(_ agent: RemoteCatalogAgent) { + id = agent.id + displayName = agent.displayName + } +} + +struct AgentQuery: EntityStringQuery { + func entities(for identifiers: [String]) async throws -> [AgentEntity] { + let catalog = await IntentCatalog.current() + // Accept unavailable ids here so a saved Shortcut still decodes; perform() + // re-checks availability at run time. + return identifiers.compactMap { catalog.agent(id: $0) }.map(AgentEntity.init) + } + + func entities(matching string: String) async throws -> [AgentEntity] { + await IntentCatalog.current().agents(matching: string).map(AgentEntity.init) + } + + func suggestedEntities() async throws -> [AgentEntity] { + await IntentCatalog.current().availableAgents.map(AgentEntity.init) + } +} diff --git a/native/pipper-remote-ios/App/Intents/PipperRemoteShortcuts.swift b/native/pipper-remote-ios/App/Intents/PipperRemoteShortcuts.swift new file mode 100644 index 0000000..62ea3bf --- /dev/null +++ b/native/pipper-remote-ios/App/Intents/PipperRemoteShortcuts.swift @@ -0,0 +1,37 @@ +import AppIntents + +/// Phrases Siri listens for without any Shortcuts setup. `\(.applicationName)` +/// is required in every phrase, and App Shortcuts allows at most one entity +/// parameter per phrase, so project and agent get separate phrase families. +/// Siri then asks for the (required) task; an unnamed agent resolves to the +/// Mac's default in `perform()`. +struct PipperRemoteShortcuts: AppShortcutsProvider { + static var shortcutTileColor: ShortcutTileColor = .navy + + static var appShortcuts: [AppShortcut] { + AppShortcut( + intent: StartThreadIntent(), + phrases: [ + "Start a thread in \(.applicationName)", + "Start a \(.applicationName) thread", + "New \(.applicationName) thread", + "Start a \(.applicationName) thread in \(\.$project)", + "Start a thread in \(\.$project) with \(.applicationName)", + "New \(.applicationName) thread in \(\.$project)", + "Start a \(.applicationName) thread with \(\.$agent)", + "Ask \(\.$agent) in \(.applicationName)", + ], + shortTitle: "Start thread", + systemImageName: "bubble.left.and.text.bubble.right" + ) + AppShortcut( + intent: CheckMacIntent(), + phrases: [ + "Is my Mac reachable in \(.applicationName)", + "Check my Mac with \(.applicationName)", + ], + shortTitle: "Check Mac", + systemImageName: "laptopcomputer.and.arrow.down" + ) + } +} diff --git a/native/pipper-remote-ios/App/Intents/StartThreadIntent.swift b/native/pipper-remote-ios/App/Intents/StartThreadIntent.swift new file mode 100644 index 0000000..a337687 --- /dev/null +++ b/native/pipper-remote-ios/App/Intents/StartThreadIntent.swift @@ -0,0 +1,115 @@ +import AppIntents +import Foundation + +enum StartThreadError: Error, CustomLocalizedStringResourceConvertible { + case notPaired + case noAgent + case agentUnavailable(String) + case remote(String) + + var localizedStringResource: LocalizedStringResource { + switch self { + case .notPaired: + return "Pipper isn't paired with your Mac yet. Open the app and scan the pairing code." + case .noAgent: + return "No agent is installed on your Mac. Pick one in Pipper on the Mac first." + case .agentUnavailable(let name): + return "\(name) isn't available on your Mac right now. Pick another agent." + case .remote(let message): + return "\(message)" + } + } +} + +/// Siri-first entry point: "Start a Pipper thread in FolkLore with Codex". +/// Runs in the app process in the background (no app launch), POSTs to the +/// laptop over Tailscale, and speaks the result. +struct StartThreadIntent: AppIntent { + static var title: LocalizedStringResource = "Start Pipper thread" + static var description = IntentDescription( + "Starts a new agent thread on your Mac in a chosen project.", + categoryName: "Productivity") + static var openAppWhenRun: Bool = false + + @Parameter(title: "Project", description: "The project on your Mac to work in") + var project: ProjectEntity + + @Parameter(title: "Agent", description: "The coding agent to run. Uses your Mac's default when omitted.") + var agent: AgentEntity? + + @Parameter( + title: "Task", + description: "What the agent should do", + requestValueDialog: "What should the thread work on?") + var prompt: String + + static var parameterSummary: some ParameterSummary { + Summary("Start \(\.$prompt) in \(\.$project)") { + \.$agent + } + } + + func perform() async throws -> some IntentResult & ProvidesDialog & ReturnsValue { + let session = await MainActor.run { RemoteSession.shared } + guard let client = await MainActor.run(body: { session.client }) else { + throw StartThreadError.notPaired + } + // Re-validate against the freshest catalog we can get: availability may + // have changed since the parameter was picked. + var catalog = await session.refreshCatalog() + if catalog == nil { catalog = await MainActor.run { session.catalog } } + guard let catalog else { throw StartThreadError.notPaired } + let chosenAgent: RemoteCatalogAgent + if let agent { + guard let live = catalog.agent(id: agent.id), live.available else { + throw StartThreadError.agentUnavailable(agent.displayName) + } + chosenAgent = live + } else { + guard let preferred = catalog.preferredAgent else { throw StartThreadError.noAgent } + chosenAgent = preferred + } + let task = prompt.trimmingCharacters(in: .whitespacesAndNewlines) + guard !task.isEmpty else { + throw $prompt.needsValueError("What should the thread work on?") + } + + let thread: RemoteThreadSummary + do { + thread = try await client.createThread(projectId: project.id, agentId: chosenAgent.id, prompt: task) + } catch { + throw StartThreadError.remote(error.localizedDescription) + } + await MainActor.run { session.lastSiriThreadId = thread.id } + return .result( + value: thread.id, + dialog: "Started a thread in \(project.name) with \(chosenAgent.displayName). I'll keep it running on your Mac.") + } +} + +/// "Is my Mac reachable?" — quick diagnostic that also proves pairing works. +struct CheckMacIntent: AppIntent { + static var title: LocalizedStringResource = "Check Pipper Mac" + static var description = IntentDescription( + "Checks whether your Mac is reachable over Tailscale and how many threads are running.", + categoryName: "Productivity") + static var openAppWhenRun: Bool = false + + func perform() async throws -> some IntentResult & ProvidesDialog { + let session = await MainActor.run { RemoteSession.shared } + guard let client = await MainActor.run(body: { session.client }) else { + throw StartThreadError.notPaired + } + do { + let threads = try await client.listThreads() + let running = threads.filter(\.running).count + await session.refreshCatalog() + if running == 0 { + return .result(dialog: "Your Mac is reachable. Nothing is running right now.") + } + return .result(dialog: "Your Mac is reachable. \(running) thread\(running == 1 ? " is" : "s are") running.") + } catch { + throw StartThreadError.remote(error.localizedDescription) + } + } +} diff --git a/native/pipper-remote-ios/App/Keychain.swift b/native/pipper-remote-ios/App/Keychain.swift new file mode 100644 index 0000000..f690ce5 --- /dev/null +++ b/native/pipper-remote-ios/App/Keychain.swift @@ -0,0 +1,45 @@ +import Foundation +import Security + +/// Minimal generic-password wrapper for the pairing token. Uses the app's +/// default keychain access group, which needs no extra entitlement. +enum Keychain { + private static let service = "com.maker-or.omni.remote" + + static func read(_ account: String) -> String? { + let query: [String: Any] = [ + kSecClass as String: kSecClassGenericPassword, + kSecAttrService as String: service, + kSecAttrAccount as String: account, + kSecReturnData as String: true, + kSecMatchLimit as String: kSecMatchLimitOne, + ] + var item: CFTypeRef? + guard SecItemCopyMatching(query as CFDictionary, &item) == errSecSuccess, + let data = item as? Data + else { return nil } + return String(data: data, encoding: .utf8) + } + + static func write(_ account: String, value: String) { + delete(account) + let add: [String: Any] = [ + kSecClass as String: kSecClassGenericPassword, + kSecAttrService as String: service, + kSecAttrAccount as String: account, + kSecValueData as String: Data(value.utf8), + // Intents may run while the phone is locked (Siri from lock screen). + kSecAttrAccessible as String: kSecAttrAccessibleAfterFirstUnlock, + ] + SecItemAdd(add as CFDictionary, nil) + } + + static func delete(_ account: String) { + let query: [String: Any] = [ + kSecClass as String: kSecClassGenericPassword, + kSecAttrService as String: service, + kSecAttrAccount as String: account, + ] + SecItemDelete(query as CFDictionary) + } +} diff --git a/native/pipper-remote-ios/App/PipperRemoteApp.swift b/native/pipper-remote-ios/App/PipperRemoteApp.swift new file mode 100644 index 0000000..8a2d28a --- /dev/null +++ b/native/pipper-remote-ios/App/PipperRemoteApp.swift @@ -0,0 +1,37 @@ +import AppIntents +import SwiftUI + +@main +struct PipperRemoteApp: App { + @State private var session = RemoteSession.shared + @Environment(\.scenePhase) private var scenePhase + + init() { + // Register phrases + entity names with Siri as early as possible so a + // "Start a Pipper thread in X" works before the UI is ever opened. + PipperRemoteShortcuts.updateAppShortcutParameters() + } + + var body: some Scene { + WindowGroup { + RootView() + .environment(session) + .task { await session.refreshCatalogIfStale() } + .onChange(of: scenePhase) { _, phase in + if phase == .active { Task { await session.refreshCatalogIfStale() } } + } + } + } +} + +struct RootView: View { + @Environment(RemoteSession.self) private var session + + var body: some View { + if session.isPaired { + ThreadListView() + } else { + PairingView() + } + } +} diff --git a/native/pipper-remote-ios/App/RemoteSession.swift b/native/pipper-remote-ios/App/RemoteSession.swift new file mode 100644 index 0000000..d0301ee --- /dev/null +++ b/native/pipper-remote-ios/App/RemoteSession.swift @@ -0,0 +1,102 @@ +import AppIntents +import Foundation +import Observation + +/// Process-wide state shared by the SwiftUI app and the in-process App +/// Intents: pairing config, the cached catalog, and a client built from them. +@MainActor +@Observable +final class RemoteSession { + static let shared = RemoteSession() + + private enum Keys { + static let host = "remote.host" + static let port = "remote.port" + static let token = "remote.token" + static let lastSiriThreadId = "remote.lastSiriThreadId" + } + + private(set) var config: RemoteConfig? + private(set) var catalog: RemoteCatalog + private(set) var catalogError: String? + private(set) var lastCatalogRefresh: Date? + + let catalogStore = CatalogStore.standard() + + private init() { + let defaults = UserDefaults.standard + if let host = defaults.string(forKey: Keys.host), !host.isEmpty, + let token = Keychain.read(Keys.token), !token.isEmpty + { + let port = defaults.integer(forKey: Keys.port) + config = RemoteConfig(host: host, port: port == 0 ? RemoteConfig.defaultPort : port, token: token) + } + catalog = catalogStore.load() ?? .empty + lastCatalogRefresh = catalogStore.modifiedAt + } + + var isPaired: Bool { config?.isComplete == true } + + var client: RemoteClient? { + guard let config, config.isComplete else { return nil } + return RemoteClient(config: config) + } + + /// Persist a pairing after `health()` succeeded. Token goes to the Keychain, + /// host/port to defaults. + func pair(_ next: RemoteConfig) { + let defaults = UserDefaults.standard + defaults.set(next.host, forKey: Keys.host) + defaults.set(next.port, forKey: Keys.port) + Keychain.write(Keys.token, value: next.token) + config = next + } + + func unpair() { + let defaults = UserDefaults.standard + defaults.removeObject(forKey: Keys.host) + defaults.removeObject(forKey: Keys.port) + defaults.removeObject(forKey: Keys.lastSiriThreadId) + Keychain.delete(Keys.token) + catalogStore.clear() + config = nil + catalog = .empty + lastCatalogRefresh = nil + Task { PipperRemoteShortcuts.updateAppShortcutParameters() } + } + + /// Pull the laptop catalog, cache it for Siri, and tell App Shortcuts the + /// entity names changed so spoken phrases like "in FolkLore" resolve. + @discardableResult + func refreshCatalog() async -> RemoteCatalog? { + guard let client else { return nil } + do { + let fresh = try await client.fetchCatalog() + try? catalogStore.save(fresh) + catalog = fresh + catalogError = nil + lastCatalogRefresh = Date() + PipperRemoteShortcuts.updateAppShortcutParameters() + return fresh + } catch { + catalogError = error.localizedDescription + return nil + } + } + + /// Refresh only when the cache is missing or older than `maxAge`. + func refreshCatalogIfStale(maxAge: TimeInterval = 10 * 60) async { + if let last = lastCatalogRefresh, Date().timeIntervalSince(last) < maxAge, !catalog.projects.isEmpty { + return + } + await refreshCatalog() + } + + // MARK: Siri → app handoff + + /// Thread most recently created by Siri; the app lands on it next open. + var lastSiriThreadId: String? { + get { UserDefaults.standard.string(forKey: Keys.lastSiriThreadId) } + set { UserDefaults.standard.set(newValue, forKey: Keys.lastSiriThreadId) } + } +} diff --git a/native/pipper-remote-ios/App/Views/PairingView.swift b/native/pipper-remote-ios/App/Views/PairingView.swift new file mode 100644 index 0000000..6d5244e --- /dev/null +++ b/native/pipper-remote-ios/App/Views/PairingView.swift @@ -0,0 +1,119 @@ +import SwiftUI + +/// Pair with the laptop: scan the QR from Pipper → Settings → Remote access +/// (or the terminal), or type the Tailscale host + token by hand. +struct PairingView: View { + @Environment(RemoteSession.self) private var session + @State private var host = "" + @State private var port = String(RemoteConfig.defaultPort) + @State private var token = "" + @State private var scanning = false + @State private var testing = false + @State private var error: String? + + /// The host field tolerates `host:port` or a pasted URL; the port/token + /// fields win only when the host field carried none. + private var draft: RemoteConfig { + let parsed = PairingURL.parseHostInput(host) + return RemoteConfig( + host: parsed?.host ?? "", + port: parsed?.port ?? Int(port) ?? RemoteConfig.defaultPort, + token: parsed?.token ?? token) + } + + var body: some View { + NavigationStack { + Form { + Section { + Button { + scanning = true + } label: { + Label("Scan pairing QR", systemImage: "qrcode.viewfinder") + } + } footer: { + Text("On the Mac: Pipper → Settings → Remote access. The phone must be on the same Tailscale network.") + } + Section("Or enter manually") { + TextField("Tailscale IP (100.x.x.x)", text: $host) + .keyboardType(.numbersAndPunctuation) + .textInputAutocapitalization(.never) + .autocorrectionDisabled() + .onChange(of: host) { _, value in + // Pasted "host:port" or a full pairing URL: split it into the + // fields so what the user sees is what gets used. + guard let parsed = PairingURL.parseHostInput(value), + parsed.port != nil || parsed.token != nil + else { return } + host = parsed.host + if let p = parsed.port { port = String(p) } + if let t = parsed.token { token = t } + } + TextField("Port", text: $port) + .keyboardType(.numberPad) + SecureField("Pairing token", text: $token) + .textInputAutocapitalization(.never) + .autocorrectionDisabled() + } + if let error { + Section { + Text(error).foregroundStyle(.red) + } + } + Section { + Button { + Task { await pair(draft) } + } label: { + if testing { + ProgressView() + } else { + Text("Pair") + } + } + .disabled(!draft.isComplete || testing) + } + } + .navigationTitle("Pair with your Mac") + .sheet(isPresented: $scanning) { + QRScannerSheet { text in + scanning = false + if let cfg = PairingURL.parse(text) { + host = cfg.host + port = String(cfg.port) + token = cfg.token + Task { await pair(cfg) } + } else if PairingURL.isBareToken(text) { + token = text.trimmingCharacters(in: .whitespacesAndNewlines) + } else { + error = "That QR isn't a Pipper pairing code." + } + } + } + .onOpenURL { url in + // pipper-remote://pair?url= — lets a future + // desktop "Send to phone" open the app directly. + guard let items = URLComponents(url: url, resolvingAgainstBaseURL: false)?.queryItems, + let raw = items.first(where: { $0.name == "url" })?.value, + let cfg = PairingURL.parse(raw) + else { return } + Task { await pair(cfg) } + } + } + } + + private func pair(_ cfg: RemoteConfig) async { + error = nil + testing = true + defer { testing = false } + do { + let ok = try await RemoteClient(config: cfg).health() + guard ok else { + error = "The Mac answered, but not as Pipper." + return + } + session.pair(cfg) + await session.refreshCatalog() + } catch { + self.error = error.localizedDescription + } + } +} diff --git a/native/pipper-remote-ios/App/Views/QRScannerSheet.swift b/native/pipper-remote-ios/App/Views/QRScannerSheet.swift new file mode 100644 index 0000000..2e52cf5 --- /dev/null +++ b/native/pipper-remote-ios/App/Views/QRScannerSheet.swift @@ -0,0 +1,114 @@ +import AVFoundation +import SwiftUI + +/// Camera QR reader built on AVCaptureMetadataOutput — works on every device +/// and needs only NSCameraUsageDescription. +struct QRScannerSheet: View { + let onCode: (String) -> Void + @Environment(\.dismiss) private var dismiss + @State private var denied = false + + var body: some View { + NavigationStack { + ZStack { + if denied { + ContentUnavailableView( + "Camera access needed", + systemImage: "camera.fill", + description: Text("Allow camera access in Settings, or enter the token manually.")) + } else { + QRScannerView(onCode: onCode, onDenied: { denied = true }) + .ignoresSafeArea() + RoundedRectangle(cornerRadius: 16) + .strokeBorder(.white.opacity(0.8), lineWidth: 2) + .frame(width: 240, height: 240) + } + } + .navigationTitle("Scan pairing code") + .navigationBarTitleDisplayMode(.inline) + .toolbar { + ToolbarItem(placement: .cancellationAction) { + Button("Cancel") { dismiss() } + } + } + } + } +} + +private struct QRScannerView: UIViewControllerRepresentable { + let onCode: (String) -> Void + let onDenied: () -> Void + + func makeUIViewController(context: Context) -> ScannerController { + let vc = ScannerController() + vc.onCode = onCode + vc.onDenied = onDenied + return vc + } + + func updateUIViewController(_ uiViewController: ScannerController, context: Context) {} +} + +final class ScannerController: UIViewController, AVCaptureMetadataOutputObjectsDelegate { + var onCode: ((String) -> Void)? + var onDenied: (() -> Void)? + private let session = AVCaptureSession() + private var preview: AVCaptureVideoPreviewLayer? + private var fired = false + + override func viewDidLoad() { + super.viewDidLoad() + view.backgroundColor = .black + AVCaptureDevice.requestAccess(for: .video) { [weak self] granted in + DispatchQueue.main.async { + guard let self else { return } + if granted { self.configure() } else { self.onDenied?() } + } + } + } + + private func configure() { + guard let device = AVCaptureDevice.default(for: .video), + let input = try? AVCaptureDeviceInput(device: device), + session.canAddInput(input) + else { + onDenied?() + return + } + session.addInput(input) + let output = AVCaptureMetadataOutput() + guard session.canAddOutput(output) else { return } + session.addOutput(output) + output.setMetadataObjectsDelegate(self, queue: .main) + output.metadataObjectTypes = [.qr] + let layer = AVCaptureVideoPreviewLayer(session: session) + layer.videoGravity = .resizeAspectFill + layer.frame = view.bounds + view.layer.addSublayer(layer) + preview = layer + DispatchQueue.global(qos: .userInitiated).async { [session] in session.startRunning() } + } + + override func viewDidLayoutSubviews() { + super.viewDidLayoutSubviews() + preview?.frame = view.bounds + } + + override func viewWillDisappear(_ animated: Bool) { + super.viewWillDisappear(animated) + if session.isRunning { session.stopRunning() } + } + + func metadataOutput( + _ output: AVCaptureMetadataOutput, didOutput metadataObjects: [AVMetadataObject], + from connection: AVCaptureConnection + ) { + guard !fired, + let code = metadataObjects.compactMap({ $0 as? AVMetadataMachineReadableCodeObject }).first, + let text = code.stringValue + else { return } + fired = true + session.stopRunning() + onCode?(text) + } +} diff --git a/native/pipper-remote-ios/App/Views/SettingsView.swift b/native/pipper-remote-ios/App/Views/SettingsView.swift new file mode 100644 index 0000000..9316f8c --- /dev/null +++ b/native/pipper-remote-ios/App/Views/SettingsView.swift @@ -0,0 +1,97 @@ +import AppIntents +import SwiftUI + +struct SettingsView: View { + @Environment(RemoteSession.self) private var session + @Environment(\.dismiss) private var dismiss + @State private var refreshing = false + @State private var reachable: Bool? + + var body: some View { + NavigationStack { + Form { + Section("Mac") { + LabeledContent("Host", value: session.config?.host ?? "—") + LabeledContent("Port", value: session.config.map { String($0.port) } ?? "—") + Button("Test connection") { Task { await test() } } + if let reachable { + Label( + reachable ? "Reachable" : "Not reachable", + systemImage: reachable ? "checkmark.circle.fill" : "xmark.circle.fill") + .foregroundStyle(reachable ? .green : .red) + } + } + Section { + Button { + Task { + refreshing = true + await session.refreshCatalog() + refreshing = false + } + } label: { + HStack { + Text("Refresh catalog") + Spacer() + if refreshing { ProgressView() } + } + } + if let err = session.catalogError { + Text(err).font(.footnote).foregroundStyle(.red) + } + if let last = session.lastCatalogRefresh { + LabeledContent("Updated", value: last.formatted(date: .abbreviated, time: .shortened)) + } + } header: { + Text("Siri catalog") + } footer: { + Text("Siri resolves project and agent names from this cached list, so it works even when the Mac is asleep. It refreshes automatically when the app opens.") + } + Section("Projects (\(session.catalog.projects.count))") { + ForEach(session.catalog.projects) { p in + VStack(alignment: .leading) { + Text(p.name) + Text(p.path).font(.caption).foregroundStyle(.secondary).lineLimit(1) + } + } + } + Section("Agents") { + ForEach(session.catalog.agents) { a in + HStack { + Text(a.displayName) + if a.id == session.catalog.defaultAgentId { + Text("default").font(.caption).foregroundStyle(.secondary) + } + Spacer() + Text(a.available ? "available" : "not installed") + .font(.caption) + .foregroundStyle(a.available ? .green : .secondary) + } + } + } + Section("Siri") { + ShortcutsLink() + Text("Try: “Start a Pipper thread in \(session.catalog.projects.first?.name ?? "FolkLore") with \(session.catalog.preferredAgent?.displayName ?? "Codex")”") + .font(.footnote) + .foregroundStyle(.secondary) + } + Section { + Button("Unpair", role: .destructive) { + session.unpair() + dismiss() + } + } + } + .navigationTitle("Settings") + .toolbar { + ToolbarItem(placement: .confirmationAction) { + Button("Done") { dismiss() } + } + } + } + } + + private func test() async { + guard let client = session.client else { return } + reachable = (try? await client.health()) ?? false + } +} diff --git a/native/pipper-remote-ios/App/Views/ThreadDetailView.swift b/native/pipper-remote-ios/App/Views/ThreadDetailView.swift new file mode 100644 index 0000000..e882c73 --- /dev/null +++ b/native/pipper-remote-ios/App/Views/ThreadDetailView.swift @@ -0,0 +1,232 @@ +import SwiftUI + +/// One thread's transcript (polled every 3s — the laptop holds back +/// in-progress agent text, so replies arrive whole) plus a follow-up box. +struct ThreadDetailView: View { + @Environment(RemoteSession.self) private var session + let threadId: String + + @State private var report: RemoteReport? + @State private var loadError: String? + @State private var draft = "" + @State private var sending = false + @State private var sendError: String? + /// Optimistic bubble until the transcript includes the message. + @State private var pending: (text: String, known: Int)? + /// Sticky-bottom: auto-scroll only while the user is already at the end, + /// or right after they send. Never yank someone who scrolled up to read. + @State private var nearBottom = true + @State private var forceScroll = false + + var body: some View { + VStack(spacing: 0) { + ScrollViewReader { proxy in + ScrollView { + LazyVStack(alignment: .leading, spacing: 10) { + if let report { + StatusCard(report: report) + ForEach(Array(report.messages.enumerated()), id: \.offset) { _, m in + Bubble(role: m.role, text: m.text) + } + if let pendingText = pendingVisible { + Bubble(role: .user, text: pendingText, footnote: sending ? "Sending…" : "Sent · waiting for Mac…") + } + if report.running { + HStack { + ProgressView().controlSize(.small) + Text("Working on your Mac…").font(.footnote).foregroundStyle(.secondary) + } + .padding(.horizontal, 4) + } + } else { + Text(loadError ?? "Loading…").foregroundStyle(.secondary).padding() + } + Color.clear.frame(height: 1).id("bottom") + } + .padding(12) + } + .defaultScrollAnchor(.bottom) + .scrollDismissesKeyboard(.interactively) + .onScrollGeometryChange(for: Bool.self) { geo in + geo.contentOffset.y + geo.containerSize.height >= geo.contentSize.height - 120 + } action: { _, isNear in + nearBottom = isNear + } + .onChange(of: scrollSignature) { _, _ in + guard nearBottom || forceScroll else { return } + forceScroll = false + // Let the new rows lay out before asking for the bottom anchor. + Task { @MainActor in + await Task.yield() + withAnimation(.easeOut(duration: 0.2)) { proxy.scrollTo("bottom", anchor: .bottom) } + } + } + } + if let sendError { + Text(sendError).font(.footnote).foregroundStyle(.red).padding(.horizontal) + } + Divider() + HStack(alignment: .bottom) { + TextField("Follow up…", text: $draft, axis: .vertical) + .lineLimit(1...5) + .textFieldStyle(.roundedBorder) + Button { + Task { await send() } + } label: { + Image(systemName: "paperplane.fill") + } + .buttonStyle(.borderedProminent) + .disabled(draft.trimmingCharacters(in: .whitespaces).isEmpty || sending) + } + .padding(12) + } + .navigationTitle(report?.summary ?? "Thread") + .navigationBarTitleDisplayMode(.inline) + .task(id: threadId) { await poll() } + } + + private var pendingVisible: String? { + guard let pending, let report else { return nil } + let count = report.messages.filter { $0.role == .user && $0.text == pending.text }.count + return count > pending.known ? nil : pending.text + } + + private var scrollSignature: String { + [ + String(report?.messages.count ?? 0), + String(report?.messages.last?.text.count ?? 0), + pendingVisible ?? "", + report?.running == true ? "run" : "idle", + ].joined(separator: "|") + } + + private func poll() async { + while !Task.isCancelled { + await load() + try? await Task.sleep(for: .seconds(3)) + } + } + + private func load() async { + guard let client = session.client else { return } + do { + let next = try await client.report(threadId: threadId) + if next != report { report = next } + loadError = nil + if let p = pending, next.messages.filter({ $0.role == .user && $0.text == p.text }).count > p.known { + pending = nil + } + } catch { + loadError = error.localizedDescription + } + } + + private func send() async { + guard let client = session.client else { return } + let text = draft.trimmingCharacters(in: .whitespacesAndNewlines) + guard !text.isEmpty else { return } + sending = true + sendError = nil + draft = "" + let known = (report?.messages ?? []).filter { $0.role == .user && $0.text == text }.count + forceScroll = true + pending = (text, known) + defer { sending = false } + do { + try await client.sendPrompt(threadId: threadId, prompt: text) + await load() + } catch { + draft = text + pending = nil + sendError = error.localizedDescription + } + } +} + +private struct StatusCard: View { + let report: RemoteReport + + var body: some View { + DisclosureGroup { + VStack(alignment: .leading, spacing: 6) { + if !report.isolated { + Label( + "Ran in project root — no isolated workspace." + (report.isolationNote.map { " \($0)" } ?? ""), + systemImage: "exclamationmark.triangle") + .font(.footnote) + .foregroundStyle(.orange) + } + if let wt = report.worktreePath { + Text(wt).font(.caption.monospaced()).foregroundStyle(.secondary) + } + if !report.filesTouched.isEmpty { + ForEach(report.filesTouched, id: \.self) { f in + Text(f).font(.caption.monospaced()) + } + } + } + .padding(.top, 4) + } label: { + HStack(spacing: 8) { + Circle().fill(report.running ? Color.green : Color.secondary.opacity(0.4)).frame(width: 8, height: 8) + Text(report.running ? "Running on Mac" : "Done") + if let p = report.projectName { + Text("· \(p)").foregroundStyle(.secondary) + } + Spacer() + if !report.filesTouched.isEmpty { + Text("\(report.filesTouched.count) files").font(.caption).foregroundStyle(.secondary) + } + } + .font(.subheadline) + } + .padding(10) + .background(.thinMaterial, in: RoundedRectangle(cornerRadius: 12)) + } +} + +private struct Bubble: View { + let role: RemoteMessage.Role + let text: String + var footnote: String? = nil + + var body: some View { + HStack { + if role == .user { Spacer(minLength: 40) } + VStack(alignment: .trailing, spacing: 3) { + Group { + if role == .user { + Text(text) + } else { + Text(markdown: text) + } + } + .textSelection(.enabled) + .padding(.horizontal, 12) + .padding(.vertical, 8) + .background( + role == .user ? Color.accentColor : Color(.secondarySystemBackground), + in: RoundedRectangle(cornerRadius: 16)) + .foregroundStyle(role == .user ? Color.white : Color.primary) + if let footnote { + Text(footnote).font(.caption2).foregroundStyle(.secondary) + } + } + if role == .agent { Spacer(minLength: 40) } + } + } +} + +extension Text { + /// Best-effort Markdown; falls back to plain text on parse failure. + init(markdown: String) { + if let attributed = try? AttributedString( + markdown: markdown, + options: .init(interpretedSyntax: .inlineOnlyPreservingWhitespace)) + { + self.init(attributed) + } else { + self.init(markdown) + } + } +} diff --git a/native/pipper-remote-ios/App/Views/ThreadListView.swift b/native/pipper-remote-ios/App/Views/ThreadListView.swift new file mode 100644 index 0000000..c334c2e --- /dev/null +++ b/native/pipper-remote-ios/App/Views/ThreadListView.swift @@ -0,0 +1,198 @@ +import AppIntents +import SwiftUI + +/// Home: recent threads on the Mac (polled), plus a composer for new work. +/// Siri-created threads are opened automatically on next foreground. +struct ThreadListView: View { + @Environment(RemoteSession.self) private var session + @Environment(\.scenePhase) private var scenePhase + @State private var threads: [RemoteThreadSummary] = [] + @State private var loadError: String? + @State private var showNew = false + @State private var showSettings = false + @State private var path: [String] = [] + + var body: some View { + NavigationStack(path: $path) { + List { + if let loadError { + Text(loadError).foregroundStyle(.red).font(.footnote) + } + if threads.isEmpty && loadError == nil { + ContentUnavailableView { + Label("No threads yet", systemImage: "bubble.left.and.text.bubble.right") + } description: { + Text("Ask Siri: “Start a Pipper thread in \(session.catalog.projects.first?.name ?? "your project")”, or tap +.") + } + } + ForEach(threads) { t in + NavigationLink(value: t.id) { + ThreadRow(thread: t, projectName: session.catalog.project(id: t.projectId)?.name) + } + } + Section { + SiriTipView(intent: StartThreadIntent()) + } + .listRowBackground(Color.clear) + .listRowInsets(EdgeInsets()) + } + .navigationTitle("Pipper") + .navigationDestination(for: String.self) { id in + ThreadDetailView(threadId: id) + } + .toolbar { + ToolbarItem(placement: .topBarLeading) { + Button { showSettings = true } label: { Image(systemName: "gearshape") } + } + ToolbarItem(placement: .topBarTrailing) { + Button { showNew = true } label: { Image(systemName: "plus") } + } + } + .sheet(isPresented: $showNew) { + NewThreadSheet { created in + showNew = false + threads.insert(created, at: 0) + path = [created.id] + } + } + .sheet(isPresented: $showSettings) { + SettingsView() + } + .refreshable { await load() } + .task { await poll() } + .onAppear { openSiriThreadIfAny() } + // Siri may have run while the app sat in the background; land on the + // thread it created the next time the app comes forward. + .onChange(of: scenePhase) { _, phase in + if phase == .active { openSiriThreadIfAny() } + } + } + } + + private func openSiriThreadIfAny() { + guard let id = session.lastSiriThreadId else { return } + session.lastSiriThreadId = nil + path = [id] + } + + private func load() async { + guard let client = session.client else { return } + do { + let next = try await client.listThreads() + if next != threads { threads = next } + loadError = nil + } catch { + loadError = error.localizedDescription + } + } + + private func poll() async { + while !Task.isCancelled { + await load() + try? await Task.sleep(for: .seconds(5)) + } + } +} + +private struct ThreadRow: View { + let thread: RemoteThreadSummary + let projectName: String? + + var body: some View { + HStack(spacing: 10) { + Circle() + .fill(thread.running ? Color.green : Color.secondary.opacity(0.4)) + .frame(width: 8, height: 8) + VStack(alignment: .leading, spacing: 2) { + Text(thread.title ?? String(thread.id.prefix(8))) + .lineLimit(1) + HStack(spacing: 6) { + if let projectName { Text(projectName) } + if thread.worktreePath == nil { Text("· project root") } + Text(thread.running ? "· running" : "") + } + .font(.caption) + .foregroundStyle(.secondary) + } + } + } +} + +/// Manual equivalent of the Siri intent: pick project + agent, type a task. +struct NewThreadSheet: View { + @Environment(RemoteSession.self) private var session + @Environment(\.dismiss) private var dismiss + let onCreated: (RemoteThreadSummary) -> Void + + @State private var projectId = "" + @State private var agentId = "" + @State private var prompt = "" + @State private var sending = false + @State private var error: String? + + var body: some View { + NavigationStack { + Form { + Section { + Picker("Project", selection: $projectId) { + Text("Choose…").tag("") + ForEach(session.catalog.projects) { p in + Text(p.name).tag(p.id) + } + } + Picker("Agent", selection: $agentId) { + Text("Mac default").tag("") + ForEach(session.catalog.availableAgents) { a in + Text(a.displayName).tag(a.id) + } + } + } + Section("Task") { + TextField("What should the agent do?", text: $prompt, axis: .vertical) + .lineLimit(3...8) + } + if let error { + Section { Text(error).foregroundStyle(.red) } + } + if session.catalog.projects.isEmpty { + Section { + Text(session.catalogError ?? "No projects loaded from the Mac yet.") + .foregroundStyle(.secondary) + Button("Refresh catalog") { Task { await session.refreshCatalog() } } + } + } + } + .navigationTitle("New thread") + .navigationBarTitleDisplayMode(.inline) + .toolbar { + ToolbarItem(placement: .cancellationAction) { + Button("Cancel") { dismiss() } + } + ToolbarItem(placement: .confirmationAction) { + Button("Start") { Task { await start() } } + .disabled(projectId.isEmpty || prompt.trimmingCharacters(in: .whitespaces).isEmpty || sending) + } + } + .task { + await session.refreshCatalogIfStale() + if projectId.isEmpty, let first = session.catalog.projects.first { projectId = first.id } + } + } + } + + private func start() async { + guard let client = session.client else { return } + sending = true + defer { sending = false } + error = nil + do { + let thread = try await client.createThread( + projectId: projectId, + agentId: agentId.isEmpty ? session.catalog.preferredAgent?.id : agentId, + prompt: prompt.trimmingCharacters(in: .whitespacesAndNewlines)) + onCreated(thread) + } catch { + self.error = error.localizedDescription + } + } +} diff --git a/native/pipper-remote-ios/Package.swift b/native/pipper-remote-ios/Package.swift new file mode 100644 index 0000000..3614361 --- /dev/null +++ b/native/pipper-remote-ios/Package.swift @@ -0,0 +1,21 @@ +// swift-tools-version: 6.0 +import PackageDescription + +// `swift test` here validates the Foundation-only core (catalog, HTTP client, +// pairing URL parsing) on the Mac. The iOS app in PipperRemote.xcodeproj +// compiles these same sources directly, mirroring native/pipper-intents. +let package = Package( + name: "PipperRemoteCore", + platforms: [.iOS(.v18), .macOS(.v13)], + products: [ + .library(name: "PipperRemoteCore", targets: ["PipperRemoteCore"]), + ], + targets: [ + .target(name: "PipperRemoteCore", path: "Sources/PipperRemoteCore"), + .testTarget( + name: "PipperRemoteCoreTests", + dependencies: ["PipperRemoteCore"], + path: "Tests/PipperRemoteCoreTests" + ), + ] +) diff --git a/native/pipper-remote-ios/PipperRemote.xcodeproj/project.pbxproj b/native/pipper-remote-ios/PipperRemote.xcodeproj/project.pbxproj new file mode 100644 index 0000000..1c4cd12 --- /dev/null +++ b/native/pipper-remote-ios/PipperRemote.xcodeproj/project.pbxproj @@ -0,0 +1,360 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 77; + objects = { + +/* Begin PBXBuildFile section */ + B20100000000000000000001 /* RemoteModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = B20200000000000000000001 /* RemoteModels.swift */; }; + B20100000000000000000002 /* RemoteConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = B20200000000000000000002 /* RemoteConfig.swift */; }; + B20100000000000000000003 /* CatalogStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B20200000000000000000003 /* CatalogStore.swift */; }; + B20100000000000000000004 /* RemoteClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = B20200000000000000000004 /* RemoteClient.swift */; }; + B20100000000000000000005 /* PipperRemoteApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = B20200000000000000000005 /* PipperRemoteApp.swift */; }; + B20100000000000000000006 /* Keychain.swift in Sources */ = {isa = PBXBuildFile; fileRef = B20200000000000000000006 /* Keychain.swift */; }; + B20100000000000000000007 /* RemoteSession.swift in Sources */ = {isa = PBXBuildFile; fileRef = B20200000000000000000007 /* RemoteSession.swift */; }; + B20100000000000000000008 /* CatalogEntities.swift in Sources */ = {isa = PBXBuildFile; fileRef = B20200000000000000000008 /* CatalogEntities.swift */; }; + B20100000000000000000009 /* StartThreadIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = B20200000000000000000009 /* StartThreadIntent.swift */; }; + B2010000000000000000000A /* PipperRemoteShortcuts.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2020000000000000000000A /* PipperRemoteShortcuts.swift */; }; + B2010000000000000000000B /* PairingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2020000000000000000000B /* PairingView.swift */; }; + B2010000000000000000000C /* QRScannerSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2020000000000000000000C /* QRScannerSheet.swift */; }; + B2010000000000000000000D /* ThreadListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2020000000000000000000D /* ThreadListView.swift */; }; + B2010000000000000000000E /* ThreadDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2020000000000000000000E /* ThreadDetailView.swift */; }; + B2010000000000000000000F /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2020000000000000000000F /* SettingsView.swift */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + B20200000000000000000001 /* RemoteModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RemoteModels.swift; path = Sources/PipperRemoteCore/RemoteModels.swift; sourceTree = ""; }; + B20200000000000000000002 /* RemoteConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RemoteConfig.swift; path = Sources/PipperRemoteCore/RemoteConfig.swift; sourceTree = ""; }; + B20200000000000000000003 /* CatalogStore.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = CatalogStore.swift; path = Sources/PipperRemoteCore/CatalogStore.swift; sourceTree = ""; }; + B20200000000000000000004 /* RemoteClient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RemoteClient.swift; path = Sources/PipperRemoteCore/RemoteClient.swift; sourceTree = ""; }; + B20200000000000000000005 /* PipperRemoteApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PipperRemoteApp.swift; path = App/PipperRemoteApp.swift; sourceTree = ""; }; + B20200000000000000000006 /* Keychain.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Keychain.swift; path = App/Keychain.swift; sourceTree = ""; }; + B20200000000000000000007 /* RemoteSession.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = RemoteSession.swift; path = App/RemoteSession.swift; sourceTree = ""; }; + B20200000000000000000008 /* CatalogEntities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = CatalogEntities.swift; path = App/Intents/CatalogEntities.swift; sourceTree = ""; }; + B20200000000000000000009 /* StartThreadIntent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = StartThreadIntent.swift; path = App/Intents/StartThreadIntent.swift; sourceTree = ""; }; + B2020000000000000000000A /* PipperRemoteShortcuts.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PipperRemoteShortcuts.swift; path = App/Intents/PipperRemoteShortcuts.swift; sourceTree = ""; }; + B2020000000000000000000B /* PairingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = PairingView.swift; path = App/Views/PairingView.swift; sourceTree = ""; }; + B2020000000000000000000C /* QRScannerSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = QRScannerSheet.swift; path = App/Views/QRScannerSheet.swift; sourceTree = ""; }; + B2020000000000000000000D /* ThreadListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ThreadListView.swift; path = App/Views/ThreadListView.swift; sourceTree = ""; }; + B2020000000000000000000E /* ThreadDetailView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ThreadDetailView.swift; path = App/Views/ThreadDetailView.swift; sourceTree = ""; }; + B2020000000000000000000F /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SettingsView.swift; path = App/Views/SettingsView.swift; sourceTree = ""; }; + B20200000000000000000100 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = App/Info.plist; sourceTree = ""; }; + B20200000000000000000101 /* PipperRemote.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PipperRemote.app; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + B20300000000000000000003 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + B20400000000000000000010 = { + isa = PBXGroup; + children = ( + B20400000000000000000002 /* App */, + B20400000000000000000003 /* Intents */, + B20400000000000000000004 /* Views */, + B20400000000000000000001 /* Core */, + B20400000000000000000011 /* Products */, + ); + sourceTree = ""; + }; + B20400000000000000000011 /* Products */ = { + isa = PBXGroup; + children = ( + B20200000000000000000101 /* PipperRemote.app */, + ); + name = Products; + sourceTree = ""; + }; + B20400000000000000000001 /* Core */ = { + isa = PBXGroup; + children = ( + B20200000000000000000001 /* RemoteModels.swift */, + B20200000000000000000002 /* RemoteConfig.swift */, + B20200000000000000000003 /* CatalogStore.swift */, + B20200000000000000000004 /* RemoteClient.swift */, + ); + name = Core; + sourceTree = ""; + }; + B20400000000000000000002 /* App */ = { + isa = PBXGroup; + children = ( + B20200000000000000000005 /* PipperRemoteApp.swift */, + B20200000000000000000006 /* Keychain.swift */, + B20200000000000000000007 /* RemoteSession.swift */, + B20200000000000000000100 /* Info.plist */, + ); + name = App; + sourceTree = ""; + }; + B20400000000000000000003 /* Intents */ = { + isa = PBXGroup; + children = ( + B20200000000000000000008 /* CatalogEntities.swift */, + B20200000000000000000009 /* StartThreadIntent.swift */, + B2020000000000000000000A /* PipperRemoteShortcuts.swift */, + ); + name = Intents; + sourceTree = ""; + }; + B20400000000000000000004 /* Views */ = { + isa = PBXGroup; + children = ( + B2020000000000000000000B /* PairingView.swift */, + B2020000000000000000000C /* QRScannerSheet.swift */, + B2020000000000000000000D /* ThreadListView.swift */, + B2020000000000000000000E /* ThreadDetailView.swift */, + B2020000000000000000000F /* SettingsView.swift */, + ); + name = Views; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + B20500000000000000000001 /* PipperRemote */ = { + isa = PBXNativeTarget; + buildConfigurationList = B20800000000000000000002 /* Build configuration list for PBXNativeTarget "PipperRemote" */; + buildPhases = ( + B20300000000000000000001 /* Sources */, + B20300000000000000000003 /* Frameworks */, + B20300000000000000000002 /* Resources */, + B20300000000000000000004 /* Sign simulator build with Team ID */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = PipperRemote; + productName = PipperRemote; + productReference = B20200000000000000000101 /* PipperRemote.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + B20700000000000000000001 /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = 1; + LastSwiftUpdateCheck = 2600; + LastUpgradeCheck = 2600; + TargetAttributes = { + B20500000000000000000001 = { + CreatedOnToolsVersion = 26.0; + }; + }; + }; + buildConfigurationList = B20800000000000000000001 /* Build configuration list for PBXProject "PipperRemote" */; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = B20400000000000000000010; + productRefGroup = B20400000000000000000011 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + B20500000000000000000001 /* PipperRemote */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + B20300000000000000000002 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + B20300000000000000000004 /* Sign simulator build with Team ID */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "$(TARGET_BUILD_DIR)/$(EXECUTABLE_PATH)", + "$(TARGET_BUILD_DIR)/$(INFOPLIST_PATH)", + ); + name = "Sign simulator build with Team ID"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"$SRCROOT/scripts/sign-simulator.sh\"\n"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + B20300000000000000000001 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + B20100000000000000000001 /* RemoteModels.swift in Sources */, + B20100000000000000000002 /* RemoteConfig.swift in Sources */, + B20100000000000000000003 /* CatalogStore.swift in Sources */, + B20100000000000000000004 /* RemoteClient.swift in Sources */, + B20100000000000000000005 /* PipperRemoteApp.swift in Sources */, + B20100000000000000000006 /* Keychain.swift in Sources */, + B20100000000000000000007 /* RemoteSession.swift in Sources */, + B20100000000000000000008 /* CatalogEntities.swift in Sources */, + B20100000000000000000009 /* StartThreadIntent.swift in Sources */, + B2010000000000000000000A /* PipperRemoteShortcuts.swift in Sources */, + B2010000000000000000000B /* PairingView.swift in Sources */, + B2010000000000000000000C /* QRScannerSheet.swift in Sources */, + B2010000000000000000000D /* ThreadListView.swift in Sources */, + B2010000000000000000000E /* ThreadDetailView.swift in Sources */, + B2010000000000000000000F /* SettingsView.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + B20900000000000000000001 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_NO_COMMON_BLOCKS = YES; + IPHONEOS_DEPLOYMENT_TARGET = 18.0; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_TESTABILITY = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + ONLY_ACTIVE_ARCH = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + B20900000000000000000002 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + COPY_PHASE_STRIP = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_NO_COMMON_BLOCKS = YES; + IPHONEOS_DEPLOYMENT_TARGET = 18.0; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + SWIFT_COMPILATION_MODE = wholemodule; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + B20900000000000000000003 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + "CODE_SIGNING_ALLOWED[sdk=iphonesimulator*]" = NO; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = ""; + ENABLE_PREVIEWS = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GENERATE_INFOPLIST_FILE = NO; + INFOPLIST_FILE = App/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + MARKETING_VERSION = 0.0.23; + PRODUCT_BUNDLE_IDENTIFIER = com.maker-or.omni.remote; + PRODUCT_NAME = PipperRemote; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SWIFT_EMIT_LOC_STRINGS = YES; + + }; + name = Debug; + }; + B20900000000000000000004 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + "CODE_SIGNING_ALLOWED[sdk=iphonesimulator*]" = NO; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = ""; + ENABLE_PREVIEWS = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GENERATE_INFOPLIST_FILE = NO; + INFOPLIST_FILE = App/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + MARKETING_VERSION = 0.0.23; + PRODUCT_BUNDLE_IDENTIFIER = com.maker-or.omni.remote; + PRODUCT_NAME = PipperRemote; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SWIFT_EMIT_LOC_STRINGS = YES; + + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + B20800000000000000000001 /* Build configuration list for PBXProject "PipperRemote" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B20900000000000000000001 /* Debug */, + B20900000000000000000002 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + B20800000000000000000002 /* Build configuration list for PBXNativeTarget "PipperRemote" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + B20900000000000000000003 /* Debug */, + B20900000000000000000004 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = B20700000000000000000001 /* Project object */; +} diff --git a/native/pipper-remote-ios/README.md b/native/pipper-remote-ios/README.md new file mode 100644 index 0000000..7cb40f7 --- /dev/null +++ b/native/pipper-remote-ios/README.md @@ -0,0 +1,95 @@ +# PipperRemote (iOS, Siri-first) + +Native SwiftUI companion that talks to the laptop's `RemoteServer` +(`electron/remote-server.ts`) over Tailscale — the same HTTP + bearer-token +surface the phone PWA uses. Its reason to exist is Siri: + +> "Start a Pipper thread in FolkLore" → Siri asks "What should the thread +> work on?" → the laptop creates a `phone-xxxx` worktree + thread and runs the +> agent. The app never has to open. + +## How it maps to the macOS Siri integration + +| macOS (`native/pipper-intents`) | iOS (this app) | +| ------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------- | +| Electron writes `siri-catalog.json` to `~/Library/pipper` | Laptop serves it as `GET /api/remote/catalog`; app caches it in its own Application Support | +| `String` params + `DynamicOptionsProvider` (ad-hoc workaround) | Real `AppEntity` (`ProjectEntity`, `AgentEntity`) + `EntityStringQuery` so Siri phrases can carry the project/agent | +| Intent stages `siri-requests/.json`, opens `pipper://siri/` | Intent POSTs `/api/remote/threads` directly (`modelId` = agent id) | +| App Intents **extension** (needs sandbox exceptions) | Intents run **in the app process** — no App Group, so a personal (free) team is enough | + +The catalog shape is identical on both sides (`RemoteCatalog` ⇔ `SiriCatalog` +in `electron/siri/siri-catalog.ts`): selected agents only, with `available`. +Siri resolves names against the on-disk cache (fast, works with the Mac +asleep); the app refreshes it on launch/foreground, after every intent, and on +demand from Settings, then calls `updateAppShortcutParameters()` so Siri +learns new project names. + +## Layout + +- `Sources/PipperRemoteCore/` — Foundation-only: wire models, `RemoteConfig`, + `PairingURL` (parses the laptop QR `http://100.x:4173/remote#token=…`), + `CatalogStore`, `RemoteClient`. `swift test` runs here on the Mac. +- `App/` — SwiftUI app, `RemoteSession` (pairing in Keychain + defaults, + catalog), and `Intents/` (`StartThreadIntent`, `CheckMacIntent`, entities, + `PipperRemoteShortcuts` phrases). +- `PipperRemote.xcodeproj` — single app target compiling both directories. + +## Build & install + +### Device (Siri by voice) + +1. Open `PipperRemote.xcodeproj` in Xcode, select the `PipperRemote` target → + Signing & Capabilities → pick your personal team. Change the bundle id if + `com.maker-or.omni.remote` is taken on your team. +2. Run on the phone. Free provisioning profiles expire after 7 days — re-run + from Xcode to renew. +3. Install Tailscale on the phone and join the Mac's tailnet. +4. Pair: scan the QR from Pipper → Settings → Remote access, or type the + three fields printed by `bun run dev` under `[Remote] iOS app → Pair`. +5. Say "Start a Pipper thread in ". First-time phrase indexing can + take a minute after install. + +### Simulator (intent via the Shortcuts app; no Siri voice) + +```bash +native/pipper-remote-ios/scripts/run-simulator.sh # iPhone 17 Pro +native/pipper-remote-ios/scripts/run-simulator.sh "iPhone 17" +``` + +Then pair manually (the simulator has no camera) and test the intent from +**Shortcuts → + → "Start Pipper thread"**. + +**Why the project re-signs simulator builds.** Xcode ad-hoc signs every +simulator build, and an ad-hoc bundle has no Team ID. App Intents then cannot +register the app's `AppEntity` types (`ProjectEntity is not a registered +AppEntity identifier` in the log), every entity parameter arrives `nil`, and +Shortcuts reports "could not run because an internal error occurred" +(`LNContextErrorDomain 2004`). This is the same failure the ad-hoc macOS +extension hit. The target sets `CODE_SIGNING_ALLOWED=NO` for the simulator +SDK and `scripts/sign-simulator.sh` signs with the first `Apple Development` +identity in the keychain instead, so both `xcodebuild` and Xcode's Run button +produce a working build. You need to be signed in to Xcode → Settings → +Accounts once so that identity exists. Never pass `CODE_SIGNING_ALLOWED=NO` +on the command line: it also disables the re-sign phase. + +Core tests (no simulator needed): `cd native/pipper-remote-ios && swift test`. + +## Phrases + +App Shortcuts allow one entity parameter per phrase, so: + +- `Start a thread in Pipper` / `Start a Pipper thread` / `New Pipper thread` +- `Start a Pipper thread in ` / `New Pipper thread in ` +- `Start a Pipper thread with ` / `Ask in Pipper` +- `Is my Mac reachable in Pipper` / `Check my Mac with Pipper` + +Siri always asks for the task (it is a required `String`). When no agent is +named, `perform()` uses the Mac's default agent from the catalog, falling back +to the first available one. + +## Threat model + +Plain HTTP on purpose, exactly like the PWA: the laptop only binds loopback + +Tailscale, so the bearer token only ever crosses the WireGuard tailnet. ATS is +opened (`NSAllowsArbitraryLoads`) for that reason. The token lives in the +Keychain with `AfterFirstUnlock` so Siri works from the lock screen. diff --git a/native/pipper-remote-ios/Sources/PipperRemoteCore/CatalogStore.swift b/native/pipper-remote-ios/Sources/PipperRemoteCore/CatalogStore.swift new file mode 100644 index 0000000..e8954b3 --- /dev/null +++ b/native/pipper-remote-ios/Sources/PipperRemoteCore/CatalogStore.swift @@ -0,0 +1,43 @@ +import Foundation + +/// On-disk cache of the laptop catalog. Siri parameter resolution reads this +/// (fast, offline-safe); the app and intents refresh it opportunistically. +public struct CatalogStore: Sendable { + public let fileURL: URL + + public init(fileURL: URL) { + self.fileURL = fileURL + } + + /// `/PipperRemote/siri-catalog.json` in the app's own + /// container. Intents run in-process, so no App Group is needed. + public static func standard() -> CatalogStore { + let base = + FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask).first + ?? FileManager.default.temporaryDirectory + return CatalogStore( + fileURL: base.appendingPathComponent("PipperRemote", isDirectory: true) + .appendingPathComponent("siri-catalog.json")) + } + + public func load() -> RemoteCatalog? { + guard let data = try? Data(contentsOf: fileURL) else { return nil } + return try? JSONDecoder().decode(RemoteCatalog.self, from: data) + } + + public func save(_ catalog: RemoteCatalog) throws { + try FileManager.default.createDirectory( + at: fileURL.deletingLastPathComponent(), withIntermediateDirectories: true) + let data = try JSONEncoder().encode(catalog) + try data.write(to: fileURL, options: .atomic) + } + + public func clear() { + try? FileManager.default.removeItem(at: fileURL) + } + + /// When the cache was last written, for staleness checks. + public var modifiedAt: Date? { + (try? FileManager.default.attributesOfItem(atPath: fileURL.path))?[.modificationDate] as? Date + } +} diff --git a/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteClient.swift b/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteClient.swift new file mode 100644 index 0000000..f7cefec --- /dev/null +++ b/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteClient.swift @@ -0,0 +1,146 @@ +import Foundation + +public enum RemoteClientError: Error, LocalizedError, Equatable { + case notPaired + case badURL + case unreachable(String) + case http(status: Int, body: String) + case decoding(String) + + public var errorDescription: String? { + switch self { + case .notPaired: return "Not paired with a Mac yet." + case .badURL: return "The Mac address is invalid." + case .unreachable(let why): return "Couldn't reach your Mac (\(why)). Is Tailscale connected?" + case .http(let status, let body): + if status == 401 { return "The Mac rejected the pairing token. Pair again." } + if status == 503 { return "The agent on your Mac isn't ready yet." } + let detail = body.trimmingCharacters(in: .whitespacesAndNewlines) + return detail.isEmpty ? "Mac returned HTTP \(status)." : "Mac returned HTTP \(status): \(detail)" + case .decoding(let why): return "Unexpected reply from the Mac (\(why))." + } + } +} + +/// Thin async client for the laptop's `/api/remote/*` routes. Bearer token on +/// every call; short timeouts because Siri waits on `perform()`. +public struct RemoteClient: Sendable { + public let config: RemoteConfig + private let session: URLSession + + public init(config: RemoteConfig, session: URLSession? = nil) { + self.config = config + if let session { + self.session = session + } else { + let c = URLSessionConfiguration.ephemeral + c.timeoutIntervalForRequest = 15 + c.timeoutIntervalForResource = 30 + c.waitsForConnectivity = false + self.session = URLSession(configuration: c) + } + } + + // MARK: Routes + + public func health() async throws -> Bool { + struct Health: Decodable { var ok: Bool } + let h: Health = try await get("/api/remote/health") + return h.ok + } + + public func fetchCatalog() async throws -> RemoteCatalog { + try await get("/api/remote/catalog") + } + + public func listThreads() async throws -> [RemoteThreadSummary] { + struct Body: Decodable { var threads: [RemoteThreadSummary] } + let b: Body = try await get("/api/remote/threads") + return b.threads + } + + public func report(threadId: String) async throws -> RemoteReport { + struct Body: Decodable { var report: RemoteReport } + let b: Body = try await get("/api/remote/threads/\(encode(threadId))/report") + return b.report + } + + /// `agentId` maps to the laptop's `modelId` field (it is an agent id there). + public func createThread(projectId: String, agentId: String?, prompt: String) async throws + -> RemoteThreadSummary + { + struct Input: Encodable { + var projectId: String + var modelId: String? + var prompt: String + } + struct Body: Decodable { var thread: RemoteThreadSummary } + let b: Body = try await post( + "/api/remote/threads", Input(projectId: projectId, modelId: agentId, prompt: prompt)) + return b.thread + } + + public func sendPrompt(threadId: String, prompt: String) async throws { + struct Input: Encodable { var prompt: String } + struct Body: Decodable { var ok: Bool } + let _: Body = try await post("/api/remote/threads/\(encode(threadId))/prompt", Input(prompt: prompt)) + } + + // MARK: Transport + + private func encode(_ segment: String) -> String { + segment.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? segment + } + + private func request(_ path: String, method: String, body: Data?) throws -> URLRequest { + guard config.isComplete, let base = config.baseURL, let url = URL(string: path, relativeTo: base) + else { throw config.token.isEmpty || config.host.isEmpty ? RemoteClientError.notPaired : .badURL } + var req = URLRequest(url: url) + req.httpMethod = method + req.setValue("Bearer \(config.token)", forHTTPHeaderField: "Authorization") + req.setValue("application/json", forHTTPHeaderField: "Content-Type") + req.setValue("application/json", forHTTPHeaderField: "Accept") + req.httpBody = body + return req + } + + private func get(_ path: String) async throws -> T { + try await perform(request(path, method: "GET", body: nil)) + } + + private func post(_ path: String, _ input: I) async throws -> T { + let data = try JSONEncoder().encode(input) + return try await perform(request(path, method: "POST", body: data)) + } + + private func perform(_ req: URLRequest) async throws -> T { + let data: Data + let response: URLResponse + do { + (data, response) = try await session.data(for: req) + } catch { + throw RemoteClientError.unreachable((error as NSError).localizedDescription) + } + guard let http = response as? HTTPURLResponse else { + throw RemoteClientError.decoding("not an HTTP response") + } + guard (200..<300).contains(http.statusCode) else { + let text = String(data: data.prefix(300), encoding: .utf8) ?? "" + throw RemoteClientError.http(status: http.statusCode, body: RemoteClient.errorMessage(from: text)) + } + do { + return try JSONDecoder().decode(T.self, from: data) + } catch { + throw RemoteClientError.decoding(String(describing: error)) + } + } + + /// Server errors are `{ "error": "..." }`; surface the message, not JSON. + static func errorMessage(from body: String) -> String { + struct E: Decodable { var error: String } + if let data = body.data(using: .utf8), let e = try? JSONDecoder().decode(E.self, from: data) { + return e.error + } + return body + } +} diff --git a/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteConfig.swift b/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteConfig.swift new file mode 100644 index 0000000..e7b8ddc --- /dev/null +++ b/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteConfig.swift @@ -0,0 +1,74 @@ +import Foundation + +/// Where the laptop is and how to authenticate. The host must be a Tailscale +/// (100.64/10) or loopback address — that is all the laptop's RemoteServer +/// binds, and the only place a bearer token may travel in cleartext. +public struct RemoteConfig: Codable, Equatable, Sendable { + public static let defaultPort = 4173 + + public var host: String + public var port: Int + public var token: String + + public init(host: String, port: Int = RemoteConfig.defaultPort, token: String) { + self.host = host.trimmingCharacters(in: .whitespacesAndNewlines) + self.port = port + self.token = token.trimmingCharacters(in: .whitespacesAndNewlines) + } + + public var baseURL: URL? { + var c = URLComponents() + c.scheme = "http" + c.host = host + c.port = port + return c.url + } + + public var isComplete: Bool { + !host.isEmpty && !token.isEmpty && baseURL != nil + } +} + +public enum PairingURL { + /// Parses the laptop's pairing QR, `http://:/remote#token=`. + /// Returns nil for anything that is not that exact shape. + public static func parse(_ text: String) -> RemoteConfig? { + let trimmed = text.trimmingCharacters(in: .whitespacesAndNewlines) + guard let components = URLComponents(string: trimmed), + components.scheme == "http", + let host = components.host, !host.isEmpty + else { return nil } + let fragment = components.fragment ?? "" + guard let range = fragment.range(of: #"token=([A-Za-z0-9]+)"#, options: .regularExpression) + else { return nil } + let token = String(fragment[range].dropFirst("token=".count)) + return RemoteConfig(host: host, port: components.port ?? RemoteConfig.defaultPort, token: token) + } + + /// Tolerant host parsing for the manual form: accepts `100.1.2.3`, + /// `100.1.2.3:4173`, `http://100.1.2.3:4173/remote…`, or the full pairing + /// URL. Returns the host and, when present, the port (and token). + public static func parseHostInput(_ text: String) -> (host: String, port: Int?, token: String?)? { + let trimmed = text.trimmingCharacters(in: .whitespacesAndNewlines) + guard !trimmed.isEmpty else { return nil } + if trimmed.contains("://") { + guard let c = URLComponents(string: trimmed), let host = c.host, !host.isEmpty else { return nil } + let token = parse(trimmed)?.token + return (host, c.port, token) + } + // "host" or "host:port" (IPv4 / hostname only; IPv6 needs the URL form). + let parts = trimmed.split(separator: ":", maxSplits: 1).map(String.init) + guard let host = parts.first, !host.isEmpty, !host.contains("/") else { return nil } + if parts.count == 2 { + guard let port = Int(parts[1]), (1...65535).contains(port) else { return nil } + return (host, port, nil) + } + return (host, nil, nil) + } + + /// A bare token pasted from the laptop terminal (hex, no URL). + public static func isBareToken(_ text: String) -> Bool { + let t = text.trimmingCharacters(in: .whitespacesAndNewlines) + return !t.isEmpty && t.range(of: #"^[A-Za-z0-9]+$"#, options: .regularExpression) != nil + } +} diff --git a/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteModels.swift b/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteModels.swift new file mode 100644 index 0000000..02f4595 --- /dev/null +++ b/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteModels.swift @@ -0,0 +1,146 @@ +import Foundation + +// Wire shapes for the laptop's RemoteServer (electron/remote-server.ts). +// Keep in sync with contracts/remote.ts and electron/siri/siri-catalog.ts. + +public struct RemoteCatalogProject: Codable, Hashable, Sendable, Identifiable { + public var id: String + public var name: String + public var path: String + + public init(id: String, name: String, path: String) { + self.id = id + self.name = name + self.path = path + } +} + +public struct RemoteCatalogAgent: Codable, Hashable, Sendable, Identifiable { + public var id: String + public var displayName: String + public var available: Bool + + public init(id: String, displayName: String, available: Bool) { + self.id = id + self.displayName = displayName + self.available = available + } +} + +/// Same document the macOS extension reads from `siri-catalog.json`; served +/// to the phone by `GET /api/remote/catalog` and cached on disk so Siri can +/// resolve projects/agents without a network hop. +public struct RemoteCatalog: Codable, Equatable, Sendable { + public var version: Int + public var updatedAt: String + public var defaultAgentId: String + public var projects: [RemoteCatalogProject] + public var agents: [RemoteCatalogAgent] + + public init( + version: Int = 1, + updatedAt: String, + defaultAgentId: String, + projects: [RemoteCatalogProject], + agents: [RemoteCatalogAgent] + ) { + self.version = version + self.updatedAt = updatedAt + self.defaultAgentId = defaultAgentId + self.projects = projects + self.agents = agents + } + + public static let empty = RemoteCatalog(updatedAt: "", defaultAgentId: "", projects: [], agents: []) + + public var availableAgents: [RemoteCatalogAgent] { agents.filter(\.available) } + + /// Preferred agent for a Siri request that named no agent: the laptop's + /// default when it is installed, else the first available one. + public var preferredAgent: RemoteCatalogAgent? { + if let d = agents.first(where: { $0.id == defaultAgentId && $0.available }) { return d } + return availableAgents.first + } + + public func project(id: String) -> RemoteCatalogProject? { + projects.first { $0.id == id } + } + + public func agent(id: String) -> RemoteCatalogAgent? { + agents.first { $0.id == id } + } + + /// Case-insensitive match for spoken/typed project names. Exact name wins, + /// then prefix, then substring — Siri passes the transcribed phrase here. + public func projects(matching query: String) -> [RemoteCatalogProject] { + RemoteCatalog.rank(projects, query: query, key: \.name) + } + + public func agents(matching query: String) -> [RemoteCatalogAgent] { + RemoteCatalog.rank(availableAgents, query: query, key: \.displayName) + } + + static func rank(_ items: [T], query: String, key: KeyPath) -> [T] { + let q = query.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() + guard !q.isEmpty else { return items } + let folded = { (s: String) in s.lowercased() } + let exact = items.filter { folded($0[keyPath: key]) == q } + let prefix = items.filter { + let n = folded($0[keyPath: key]) + return n != q && n.hasPrefix(q) + } + let contains = items.filter { + let n = folded($0[keyPath: key]) + return n != q && !n.hasPrefix(q) && n.contains(q) + } + return exact + prefix + contains + } +} + +public struct RemoteThreadSummary: Codable, Hashable, Sendable, Identifiable { + public var id: String + public var projectId: String + public var worktreePath: String? + public var title: String? + public var running: Bool + public var lastUsedAt: Double + + public init( + id: String, projectId: String, worktreePath: String?, title: String?, running: Bool, + lastUsedAt: Double + ) { + self.id = id + self.projectId = projectId + self.worktreePath = worktreePath + self.title = title + self.running = running + self.lastUsedAt = lastUsedAt + } +} + +public struct RemoteMessage: Codable, Hashable, Sendable { + public enum Role: String, Codable, Sendable { + case user + case agent + } + public var role: Role + public var text: String + + public init(role: Role, text: String) { + self.role = role + self.text = text + } +} + +public struct RemoteReport: Codable, Equatable, Sendable { + public var threadId: String + public var running: Bool + public var summary: String? + public var finalText: String? + public var messages: [RemoteMessage] + public var projectName: String? + public var filesTouched: [String] + public var worktreePath: String? + public var isolated: Bool + public var isolationNote: String? +} diff --git a/native/pipper-remote-ios/Tests/PipperRemoteCoreTests/PipperRemoteCoreTests.swift b/native/pipper-remote-ios/Tests/PipperRemoteCoreTests/PipperRemoteCoreTests.swift new file mode 100644 index 0000000..76cd5ff --- /dev/null +++ b/native/pipper-remote-ios/Tests/PipperRemoteCoreTests/PipperRemoteCoreTests.swift @@ -0,0 +1,229 @@ +import Foundation +import Testing +@testable import PipperRemoteCore + +// MARK: - URLProtocol stub so the client can be exercised without a laptop. + +final class StubURLProtocol: URLProtocol { + nonisolated(unsafe) static var handler: ((URLRequest) -> (Int, Data))? + nonisolated(unsafe) static var lastRequest: URLRequest? + nonisolated(unsafe) static var lastBody: Data? + + override class func canInit(with request: URLRequest) -> Bool { true } + override class func canonicalRequest(for request: URLRequest) -> URLRequest { request } + override func startLoading() { + StubURLProtocol.lastRequest = request + StubURLProtocol.lastBody = request.httpBody ?? request.httpBodyStream.map { stream in + stream.open() + defer { stream.close() } + var data = Data() + var buffer = [UInt8](repeating: 0, count: 4096) + while stream.hasBytesAvailable { + let n = stream.read(&buffer, maxLength: buffer.count) + if n <= 0 { break } + data.append(buffer, count: n) + } + return data + } + let (status, body) = StubURLProtocol.handler?(request) ?? (500, Data()) + let response = HTTPURLResponse( + url: request.url!, statusCode: status, httpVersion: nil, + headerFields: ["Content-Type": "application/json"])! + client?.urlProtocol(self, didReceive: response, cacheStoragePolicy: .notAllowed) + client?.urlProtocol(self, didLoad: body) + client?.urlProtocolDidFinishLoading(self) + } + override func stopLoading() {} +} + +private func stubClient(_ handler: @escaping (URLRequest) -> (Int, Data)) -> RemoteClient { + StubURLProtocol.handler = handler + let c = URLSessionConfiguration.ephemeral + c.protocolClasses = [StubURLProtocol.self] + return RemoteClient( + config: RemoteConfig(host: "100.64.0.9", port: 4173, token: "abc123"), + session: URLSession(configuration: c)) +} + +private func json(_ value: Any) -> Data { + try! JSONSerialization.data(withJSONObject: value) +} + +private let sampleCatalog = RemoteCatalog( + updatedAt: "2026-09-13T00:00:00.000Z", + defaultAgentId: "codex-acp", + projects: [ + RemoteCatalogProject(id: "p1", name: "FolkLore", path: "/Users/me/code/FolkLore"), + RemoteCatalogProject(id: "p2", name: "Folk Tales", path: "/Users/me/code/folk-tales"), + RemoteCatalogProject(id: "p3", name: "Pipper", path: "/Users/me/code/omni"), + ], + agents: [ + RemoteCatalogAgent(id: "codex-acp", displayName: "Codex", available: true), + RemoteCatalogAgent(id: "claude-acp", displayName: "Claude Code", available: true), + RemoteCatalogAgent(id: "opencode-acp", displayName: "opencode", available: false), + ]) + +@Suite("Pairing URL") +struct PairingURLTests { + @Test func parsesLaptopQr() { + let cfg = PairingURL.parse("http://100.101.102.103:4173/remote#token=deadBEEF42") + #expect(cfg == RemoteConfig(host: "100.101.102.103", port: 4173, token: "deadBEEF42")) + } + + @Test func defaultsPortWhenOmitted() { + #expect(PairingURL.parse("http://100.1.2.3/remote#token=x1")?.port == 4173) + } + + @Test func rejectsForeignUrls() { + #expect(PairingURL.parse("https://example.com/#token=abc") == nil) + #expect(PairingURL.parse("http://100.1.2.3:4173/remote") == nil) + #expect(PairingURL.parse("not a url") == nil) + } + + @Test func hostInputTolerance() { + #expect(PairingURL.parseHostInput("100.82.38.10")! == ("100.82.38.10", nil, nil)) + #expect(PairingURL.parseHostInput(" 100.82.38.10:4173 ")! == ("100.82.38.10", 4173, nil)) + #expect(PairingURL.parseHostInput("http://100.82.38.10:4173/remote#token=abc")! == ("100.82.38.10", 4173, "abc")) + #expect(PairingURL.parseHostInput("http://100.82.38.10:4173/remote")! == ("100.82.38.10", 4173, nil)) + #expect(PairingURL.parseHostInput("100.82.38.10:notaport") == nil) + #expect(PairingURL.parseHostInput("") == nil) + } + + @Test func bareTokenDetection() { + #expect(PairingURL.isBareToken(" a1b2c3 ")) + #expect(!PairingURL.isBareToken("http://x")) + #expect(!PairingURL.isBareToken("")) + } +} + +@Suite("Catalog") +struct CatalogTests { + @Test func decodesLaptopShape() throws { + // Exactly what electron/siri/siri-catalog.ts writes. + let text = """ + {"version":1,"updatedAt":"2026-09-13T01:02:03.000Z","defaultAgentId":"cursor-acp", + "projects":[{"id":"bae0366a","name":"FolkLore-LiveLore-","path":"/Users/me/code/FolkLore-LiveLore-"}], + "agents":[{"id":"opencode-acp","displayName":"opencode","available":true}]} + """ + let catalog = try JSONDecoder().decode(RemoteCatalog.self, from: Data(text.utf8)) + #expect(catalog.projects.first?.name == "FolkLore-LiveLore-") + #expect(catalog.agents.first?.available == true) + } + + @Test func spokenNameRanking() { + let hits = sampleCatalog.projects(matching: "folk") + #expect(hits.map(\.id) == ["p1", "p2"]) + #expect(sampleCatalog.projects(matching: "FOLKLORE").map(\.id) == ["p1"]) + #expect(sampleCatalog.projects(matching: "").count == 3) + #expect(sampleCatalog.projects(matching: "zzz").isEmpty) + } + + @Test func agentMatchingSkipsUnavailable() { + #expect(sampleCatalog.agents(matching: "open").isEmpty) + #expect(sampleCatalog.agents(matching: "claude").map(\.id) == ["claude-acp"]) + } + + @Test func preferredAgentFallsBackWhenDefaultUnavailable() { + var c = sampleCatalog + c.defaultAgentId = "opencode-acp" + #expect(c.preferredAgent?.id == "codex-acp") + c.defaultAgentId = "claude-acp" + #expect(c.preferredAgent?.id == "claude-acp") + } + + @Test func storeRoundTrip() throws { + let dir = FileManager.default.temporaryDirectory.appendingPathComponent( + "pipper-remote-\(UUID().uuidString)", isDirectory: true) + defer { try? FileManager.default.removeItem(at: dir) } + let store = CatalogStore(fileURL: dir.appendingPathComponent("siri-catalog.json")) + #expect(store.load() == nil) + try store.save(sampleCatalog) + #expect(store.load() == sampleCatalog) + #expect(store.modifiedAt != nil) + store.clear() + #expect(store.load() == nil) + } +} + +@Suite("Remote client", .serialized) +struct RemoteClientTests { + @Test func sendsBearerAndParsesCatalog() async throws { + let client = stubClient { req in + #expect(req.url?.path == "/api/remote/catalog") + #expect(req.value(forHTTPHeaderField: "Authorization") == "Bearer abc123") + return (200, try! JSONEncoder().encode(sampleCatalog)) + } + let catalog = try await client.fetchCatalog() + #expect(catalog == sampleCatalog) + #expect(StubURLProtocol.lastRequest?.url?.host == "100.64.0.9") + #expect(StubURLProtocol.lastRequest?.url?.port == 4173) + } + + @Test func createThreadPostsAgentAsModelId() async throws { + let client = stubClient { req in + #expect(req.httpMethod == "POST") + return ( + 201, + json([ + "thread": [ + "id": "t1", "projectId": "p1", "worktreePath": "/tmp/wt", "title": "Fix login", + "running": true, "lastUsedAt": 1_700_000_000_000, + ] + ]) + ) + } + let thread = try await client.createThread(projectId: "p1", agentId: "codex-acp", prompt: "Fix login") + #expect(thread.id == "t1") + #expect(thread.running) + let body = try JSONSerialization.jsonObject(with: StubURLProtocol.lastBody ?? Data()) as? [String: Any] + #expect(body?["projectId"] as? String == "p1") + #expect(body?["modelId"] as? String == "codex-acp") + #expect(body?["prompt"] as? String == "Fix login") + } + + @Test func unauthorizedSurfacesPairingError() async { + let client = stubClient { _ in (401, json(["error": "Unauthorized"])) } + do { + _ = try await client.listThreads() + Issue.record("expected throw") + } catch let error as RemoteClientError { + #expect(error == .http(status: 401, body: "Unauthorized")) + #expect(error.errorDescription?.contains("Pair again") == true) + } catch { + Issue.record("unexpected \(error)") + } + } + + @Test func unpairedConfigNeverHitsNetwork() async { + let client = RemoteClient(config: RemoteConfig(host: "", token: "")) + do { + _ = try await client.health() + Issue.record("expected throw") + } catch let error as RemoteClientError { + #expect(error == .notPaired) + } catch { + Issue.record("unexpected \(error)") + } + } + + @Test func reportDecodes() async throws { + let client = stubClient { _ in + ( + 200, + json([ + "report": [ + "threadId": "t1", "running": false, "summary": "Fix login", "finalText": "Done.", + "messages": [["role": "user", "text": "Fix login"], ["role": "agent", "text": "Done."]], + "projectName": "FolkLore", "filesTouched": ["src/a.ts"], "worktreePath": NSNull(), + "isolated": false, "isolationNote": "no commits yet", + ] + ]) + ) + } + let r = try await client.report(threadId: "t1") + #expect(r.messages.count == 2) + #expect(r.messages[1].role == .agent) + #expect(r.isolated == false) + #expect(r.worktreePath == nil) + } +} diff --git a/native/pipper-remote-ios/scripts/run-simulator.sh b/native/pipper-remote-ios/scripts/run-simulator.sh new file mode 100755 index 0000000..0360000 --- /dev/null +++ b/native/pipper-remote-ios/scripts/run-simulator.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# Build, install, and launch PipperRemote on an iOS simulator. +# Usage: scripts/run-simulator.sh [device-name-or-udid] (default: iPhone 17 Pro) +set -e +cd "$(dirname "$0")/.." +DEVICE="${1:-iPhone 17 Pro}" +BUNDLE_ID=com.maker-or.omni.remote +OUT="$PWD/.build/sim" + +UDID=$(xcrun simctl list devices available -j | python3 -c " +import json,sys +want=sys.argv[1] +for devs in json.load(sys.stdin)['devices'].values(): + for d in devs: + if d['udid']==want or d['name']==want: + print(d['udid']); sys.exit(0) +sys.exit(1)" "$DEVICE") || { echo "No available simulator named '$DEVICE'"; exit 1; } + +xcrun simctl bootstatus "$UDID" -b >/dev/null +open -a Simulator + +xcodebuild -project PipperRemote.xcodeproj -target PipperRemote -configuration Debug \ + -sdk iphonesimulator -arch arm64 CONFIGURATION_BUILD_DIR="$OUT" build \ + | grep -E "error|warning: no|Signing simulator|BUILD" || true + +# Final re-sign after every build step so the seal covers Metadata.appintents +# (the in-project phase can run before Xcode finishes writing it). +PLATFORM_NAME=iphonesimulator CODESIGNING_FOLDER_PATH="$OUT/PipperRemote.app" scripts/sign-simulator.sh +codesign --verify --deep --strict "$OUT/PipperRemote.app" +codesign -dvv "$OUT/PipperRemote.app" 2>&1 | grep -E "TeamIdentifier" || true + +xcrun simctl terminate "$UDID" "$BUNDLE_ID" 2>/dev/null || true +xcrun simctl install "$UDID" "$OUT/PipperRemote.app" +xcrun simctl launch "$UDID" "$BUNDLE_ID" diff --git a/native/pipper-remote-ios/scripts/sign-simulator.sh b/native/pipper-remote-ios/scripts/sign-simulator.sh new file mode 100755 index 0000000..90a0ee8 --- /dev/null +++ b/native/pipper-remote-ios/scripts/sign-simulator.sh @@ -0,0 +1,27 @@ +#!/bin/sh +# Xcode ad-hoc signs every simulator build, which leaves the bundle with no +# Team ID. App Intents then cannot register the app's AppEntity types +# ("ProjectEntity is not a registered AppEntity identifier"), every entity +# parameter arrives nil, and the intent fails with LNContextErrorDomain 2004. +# The project disables Xcode's simulator signing and this phase signs with a +# development identity instead so linkd sees a Team ID. Device builds are +# untouched: they are always team-signed. +# +# Xcode may still write Metadata.appintents after this phase (its ordering +# against the SSU/NLU step is not declarable), which leaves the resource seal +# stale. The simulator does not enforce seals, so Xcode's Run button works; +# scripts/run-simulator.sh re-runs this script after xcodebuild for a fully +# valid signature. +set -e +if [ "$PLATFORM_NAME" != "iphonesimulator" ]; then + exit 0 +fi +IDENTITY=$(security find-identity -v -p codesigning 2>/dev/null \ + | grep -o '"Apple Development[^"]*"' | head -1 | tr -d '"') +if [ -z "$IDENTITY" ]; then + echo "warning: no 'Apple Development' identity in the keychain; App Intents entity parameters will fail on the simulator. Sign in to Xcode > Settings > Accounts once to create one." + codesign --force --deep --sign - --timestamp=none "$CODESIGNING_FOLDER_PATH" + exit 0 +fi +echo "Signing simulator build with: $IDENTITY" +codesign --force --deep --sign "$IDENTITY" --timestamp=none "$CODESIGNING_FOLDER_PATH" From 70d639bc65af964342ed41e49ba137902850577a Mon Sep 17 00:00:00 2001 From: Harshith Pasupuleti Date: Sun, 27 Sep 2026 18:14:56 +0530 Subject: [PATCH 18/22] Add idempotent remote requests, permissions, and isolated phone workspaces MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Phone/Siri retries now carry a requestId so a redelivered prompt returns the original outcome instead of starting a duplicate task. Every phone task binds to a fresh isolated worktree — the project root is no longer a fallback — and new stop/permission endpoints let the phone answer Mac-side prompts. Siri intents stop file-logging prompt metadata in release builds and expose a diagnostics summary; the iOS companion picks up pairing, permission, and thread-detail updates. --- contracts/remote.ts | 26 ++ electron/agent-connection-manager.ts | 70 ++++- electron/isolated-agent-task.ts | 75 ++++++ electron/main.ts | 181 ++++++++----- electron/permission-coordinator.test.ts | 25 +- electron/permission-coordinator.ts | 50 +++- electron/remote-requests.test.ts | 57 ++++ electron/remote-requests.ts | 188 ++++++++++++++ electron/remote-server.test.ts | 205 ++++++++++++++- electron/remote-server.ts | 244 ++++++++++-------- electron/terminal-manager.test.ts | 14 + electron/terminal-manager.ts | 6 +- native/pipper-intents/README.md | 12 + .../Sources/PipperIntents.swift | 130 +++++++--- .../PipperIntentsTests.swift | 31 +++ .../App/Intents/StartThreadIntent.swift | 6 +- native/pipper-remote-ios/App/Keychain.swift | 14 +- .../pipper-remote-ios/App/RemoteSession.swift | 40 ++- .../App/Views/PairingView.swift | 35 ++- .../App/Views/SettingsView.swift | 68 ++++- .../App/Views/ThreadDetailView.swift | 75 +++++- .../App/Views/ThreadListView.swift | 17 +- native/pipper-remote-ios/README.md | 30 +++ .../PipperRemoteCore/RemoteClient.swift | 86 +++++- .../PipperRemoteCore/RemoteModels.swift | 39 +++ .../PipperRemoteCoreTests.swift | 81 +++++- src/remote/App.tsx | 192 ++++++++++++-- src/remote/remote.css | 17 ++ src/remote/submissions.test.ts | 18 ++ src/remote/submissions.ts | 26 ++ 30 files changed, 1750 insertions(+), 308 deletions(-) create mode 100644 electron/isolated-agent-task.ts create mode 100644 electron/remote-requests.test.ts create mode 100644 electron/remote-requests.ts create mode 100644 src/remote/submissions.test.ts create mode 100644 src/remote/submissions.ts diff --git a/contracts/remote.ts b/contracts/remote.ts index f535efb..87d5bb6 100644 --- a/contracts/remote.ts +++ b/contracts/remote.ts @@ -36,9 +36,34 @@ export interface RemoteReport { /** False when worktree creation failed and the task ran in project root. */ isolated: boolean; isolationNote: string | null; + permissions: RemotePermission[]; + request: RemoteRequestStatus | null; +} + +export interface RemotePermission { + id: string; + title: string; + detail: string | null; + options: Array<{ optionId: string; name: string; kind: string }>; +} + +export interface RemoteRequestStatus { + id: string; + threadId: string | null; + state: "preparing" | "running" | "completed" | "failed" | "interrupted"; + error: string | null; + updatedAt: number; +} + +export interface RemoteDiagnostics { + paired: true; + agentReady: boolean; + availableAgents: number; + projects: number; } export interface RemoteCreateThreadInput { + requestId: string; projectId: string; /** Agent/model id from the desktop registry; null = desktop default. */ modelId?: string | null; @@ -46,5 +71,6 @@ export interface RemoteCreateThreadInput { } export interface RemotePromptInput { + requestId: string; prompt: string; } diff --git a/electron/agent-connection-manager.ts b/electron/agent-connection-manager.ts index 4a27af9..2513317 100644 --- a/electron/agent-connection-manager.ts +++ b/electron/agent-connection-manager.ts @@ -248,6 +248,7 @@ export class AgentConnectionManager { threadDisplayTitle: (threadId) => this.threadDisplayTitle(threadId), }); private readonly prompts = new PromptScheduler(); + private readonly abortGenerations = new Map(); private readonly terminalManager: TerminalManager; private broadcaster!: RendererBroadcaster; private lifecycle!: ConnectionLifecycle; @@ -1380,9 +1381,10 @@ export class AgentConnectionManager { this.emit({ type: "thread-tool-calls", threadId: runtime.threadId, - toolCalls: changedToolCall - ? { [updateToolCallId]: changedToolCall } - : runtime.slice.toolCalls, + toolCalls: + changedToolCall && updateToolCallId + ? { [updateToolCallId]: changedToolCall } + : runtime.slice.toolCalls, replace: !changedToolCall, }); } else { @@ -1406,6 +1408,19 @@ export class AgentConnectionManager { return this.permissions.handle(params, requestId ?? null); } + getRemotePermissions(threadId: string) { + return this.permissions.listForThread(threadId); + } + + respondToRemotePermission( + threadId: string, + decisionId: string, + optionId?: string, + cancelled = false, + ) { + return this.permissions.respondForThread(threadId, decisionId, optionId, cancelled); + } + respondToPermission(response: { sessionId: string; requestId?: string | number; @@ -2282,7 +2297,7 @@ export class AgentConnectionManager { agentId?: string | null, worktreePath?: string | null, initialModelId?: string | null, - opts?: { background?: boolean }, + opts?: { background?: boolean; requireWorktree?: boolean }, ): Promise { return this.enqueueThreadActivation(() => this.createThreadInternal( @@ -2304,7 +2319,7 @@ export class AgentConnectionManager { agentId?: string | null, worktreePath?: string | null, initialModelId?: string | null, - opts?: { background?: boolean }, + opts?: { background?: boolean; requireWorktree?: boolean }, ): Promise { const project = getProject(projectId); if (!project) throw new Error(`Project not found: ${projectId}`); @@ -2313,6 +2328,11 @@ export class AgentConnectionManager { // stale/invalid path is never persisted as this thread's worktree. const cwd = this.resolveThreadCwd(worktreePath, project.path); const boundWorktree = cwd === project.path ? null : cwd; + if (opts?.requireWorktree && !boundWorktree) { + throw new Error( + "An isolated workspace is required. Restore the worktree on your Mac before retrying.", + ); + } const targetAgentId = agentId ?? this.preferredAgentId; // Background creation must not flip the desktop-active agent: spawning @@ -2321,6 +2341,9 @@ export class AgentConnectionManager { const live = opts?.background ? await this.acquireConnection(targetAgentId) : await this.ensureConnection(targetAgentId); + if (opts?.requireWorktree && !isLiveWorktree(cwd, project.path)) { + throw new Error("The isolated workspace is no longer available. No task was started."); + } const created = await this.sessionNew(live, cwd); this.registerWorkspaceRoot(created.sessionId, cwd); @@ -2564,17 +2587,41 @@ export class AgentConnectionManager { return thread; } - async sendPrompt(input: AcpPromptInput, opts?: { background?: boolean }): Promise { + async sendPrompt( + input: AcpPromptInput, + opts?: { background?: boolean; requireWorktree?: boolean }, + ): Promise { return this.sendPromptInternal(input, true, opts); } private async sendPromptInternal( input: AcpPromptInput, appendUserMessage: boolean, - opts?: { background?: boolean }, + opts?: { background?: boolean; requireWorktree?: boolean }, ): Promise { const threadId = input.threadId ?? this.activeThreadId; if (!threadId) throw new Error("No active thread"); + const abortGeneration = this.abortGenerations.get(threadId) ?? 0; + const assertIsolation = () => { + if ((this.abortGenerations.get(threadId) ?? 0) !== abortGeneration) { + throw new Error("Task stopped before the agent was ready."); + } + if (!opts?.requireWorktree) return; + const thread = getThread(threadId); + const project = thread ? getProject(thread.project_id) : null; + const runtime = this.sessions.get(threadId); + if ( + !thread?.worktree_path || + !project || + !isLiveWorktree(thread.worktree_path, project.path) || + (runtime && runtime.cwd !== thread.worktree_path) + ) { + throw new Error( + "This thread has no live isolated workspace. Restore its worktree on your Mac before sending more work.", + ); + } + }; + assertIsolation(); if (!this.sessions.has(threadId)) { // Background senders (phone) must not leave desktop focus behind on a // restored thread: remember the active thread and put it back after. @@ -2631,6 +2678,7 @@ export class AgentConnectionManager { throw new Error("A prompt is already in flight; choose follow-up or steer to queue it."); } + assertIsolation(); const caps = live.agentCapabilities.promptCapabilities; const blocks = assemblePromptBlocks({ message: input.message, @@ -2742,8 +2790,12 @@ export class AgentConnectionManager { } async abort(): Promise { - const threadId = this.activeThreadId; + return this.abortThread(this.activeThreadId); + } + + async abortThread(threadId: string | null): Promise { if (!threadId) return; + this.abortGenerations.set(threadId, (this.abortGenerations.get(threadId) ?? 0) + 1); const runtime = this.sessions.get(threadId); const owner = runtime ? this.connectionForAgent(runtime.agentId) : null; if (!runtime || !owner) return; @@ -2758,7 +2810,7 @@ export class AgentConnectionManager { this.subagents.cancelRunsForParent(runtime.agentSessionId); // Cascade cancel to ACP agent terminals (session/cancel → terminal/kill). // Kill keeps terminalIds valid for final output queries; release is agent-owned. - this.terminalManager.killRunning(); + this.terminalManager.killRunning(runtime.agentSessionId); } async setConfigOption(configId: string, value: string | boolean): Promise { diff --git a/electron/isolated-agent-task.ts b/electron/isolated-agent-task.ts new file mode 100644 index 0000000..23f6054 --- /dev/null +++ b/electron/isolated-agent-task.ts @@ -0,0 +1,75 @@ +import { randomBytes } from "node:crypto"; +import type { AgentManager } from "./agent-connection-manager.ts"; +import { getProject } from "./projects.ts"; +import { listThreads } from "./threads.ts"; +import { buildSiriCatalog } from "./siri/siri-catalog.ts"; +import { createWorktree, isLiveWorktree, removeWorktreeBestEffort } from "./worktree-manager.ts"; + +/** All external entry points bind to a verified worktree before dispatch. */ +export async function prepareIsolatedAgentTask( + am: AgentManager, + projectId: string, + requestedAgentId: string | null | undefined, + prompt: string, +) { + const project = getProject(projectId); + if (!project) throw new Error("Project not found. Refresh your project list."); + const catalog = buildSiriCatalog(); + const agentId = requestedAgentId ?? catalog.defaultAgentId; + if (!catalog.agents.some((a) => a.id === agentId && a.available)) { + throw new Error("The selected agent is unavailable. Choose an installed agent on your Mac."); + } + let worktree; + try { + worktree = createWorktree({ + projectPath: project.path, + projectId: project.id, + name: `phone-${randomBytes(8).toString("hex")}`, + }); + } catch (error) { + throw new Error( + `Could not create an isolated workspace. No task was started. Check that the project has a Git commit and a writable worktree directory on your Mac. ${error instanceof Error ? error.message : String(error)}`, + ); + } + try { + const thread = await am.createThread( + project.id, + prompt.slice(0, 80), + null, + agentId, + worktree.path, + null, + { background: true, requireWorktree: true }, + ); + if (thread.worktree_path !== worktree.path || !isLiveWorktree(worktree.path, project.path)) { + throw new Error( + "The thread could not bind to its isolated workspace. No prompt was sent. Check Pipper on your Mac.", + ); + } + return { + threadId: thread.id, + result: { + thread: { + id: thread.id, + projectId: thread.project_id, + worktreePath: thread.worktree_path, + title: thread.title, + running: true, + lastUsedAt: thread.last_used_at, + }, + }, + execute: () => + !prompt + ? Promise.resolve() + : am.sendPrompt( + { threadId: thread.id, message: prompt }, + { background: true, requireWorktree: true }, + ), + }; + } catch (error) { + if (!listThreads().some((t) => t.worktree_path === worktree.path)) { + removeWorktreeBestEffort(project.path, worktree.path, worktree.branch); + } + throw error; + } +} diff --git a/electron/main.ts b/electron/main.ts index db67c2d..5777dce 100644 --- a/electron/main.ts +++ b/electron/main.ts @@ -63,6 +63,8 @@ import { getThread, listThreads, listThreadsByIds, listProjectThreads } from "./ import type { OpenTabsState } from "../contracts/threads.ts"; import { listMcpServers, createMcpServer, updateMcpServer, deleteMcpServer } from "./mcp-servers"; import { AgentManager } from "./agent"; +import { getRemoteRequests } from "./remote-requests.ts"; +import { prepareIsolatedAgentTask } from "./isolated-agent-task.ts"; import { createElectronOsNotifier } from "./os-notifications"; import { WindowVisibilityGate } from "./window-visibility"; import { MonitorService } from "./monitor/service.ts"; @@ -479,34 +481,36 @@ const pendingDeepLinks: string[] = []; */ const inFlightSiriRequests = new Map>(); -/** - * Consume a Siri-staged thread request: validate, create the thread (once — - * a `.done-.json` marker records the created thread so retries never - * spawn duplicates), deliver the prompt, and only then delete the request - * file. Invalid payloads are discarded (retrying them can never succeed); - * processing failures leave the file in place for idempotent retry. - */ -async function consumeSiriRequest(requestId: string): Promise { - if (typeof requestId !== "string" || !/^[A-Za-z0-9-]{1,128}$/.test(requestId)) { +/** Staged requests are durably claimed before creating a session. Retried + * activations reopen the same thread; uncertain prompt delivery is never replayed. */ +async function consumeSiriRequest(requestId: string, preferredDir?: string): Promise { + if (typeof requestId !== "string" || !/^[A-Za-z0-9-]{1,123}$/.test(requestId)) { return null; } const existing = inFlightSiriRequests.get(requestId); if (existing) return existing; - const task = consumeSiriRequestInner(requestId).finally(() => { + const task = consumeSiriRequestInner(requestId, preferredDir).finally(() => { if (inFlightSiriRequests.get(requestId) === task) inFlightSiriRequests.delete(requestId); }); inFlightSiriRequests.set(requestId, task); return task; } -async function consumeSiriRequestInner(requestId: string): Promise { +async function consumeSiriRequestInner(requestId: string, preferredDir?: string): Promise { const { getSiriRequestsDir, getSiriRequestsDirs } = await import("./siri/siri-catalog.ts"); // Resolve the request from every supported directory so legacy-only - // staged requests are delivered, not orphaned. + // staged requests are delivered, not orphaned. The caller's `preferredDir` + // (which replica was newest) wins so the scan consumes the same file it + // ranked, not whichever dir happens to be listed first. let dir = resolve(getSiriRequestsDir()); let file: string | null = null; - for (const rawDir of getSiriRequestsDirs()) { - const candidateDir = resolve(rawDir); + const dirs = getSiriRequestsDirs().map((rawDir) => resolve(rawDir)); + const preferred = preferredDir ? resolve(preferredDir) : null; + const orderedDirs = + preferred && dirs.includes(preferred) + ? [preferred, ...dirs.filter((d) => d !== preferred)] + : dirs; + for (const candidateDir of orderedDirs) { const candidate = resolve(join(candidateDir, `${requestId}.json`)); const rel = relative(candidateDir, candidate); if (rel === "" || rel.startsWith("..") || isAbsolute(rel)) continue; @@ -516,7 +520,12 @@ async function consumeSiriRequestInner(requestId: string): Promise { break; } } - if (!file) return null; + const requests = getRemoteRequests(join(app.getPath("userData"), "remote-requests")); + const id = `siri-${requestId}`; + if (!file) { + const previous = requests.get(id); + return previous?.threadId ? getThread(previous.threadId) : null; + } const raw = fs.readFileSync(file, "utf8"); let parsed: { projectId: string; agentId?: string; prompt?: string }; try { @@ -529,43 +538,89 @@ async function consumeSiriRequestInner(requestId: string): Promise { fs.rmSync(file, { force: true }); return null; } - const manager = requireAgentManager(); - const markerFile = resolve(join(dir, `.done-${requestId}.json`)); - const hasPrompt = typeof parsed.prompt === "string" && parsed.prompt.length > 0; - const markerRel = relative(dir, markerFile); - if (!markerRel.startsWith("..") && !isAbsolute(markerRel) && fs.existsSync(markerFile)) { - // Retry path: the thread already exists, so resume delivery instead of - // creating a duplicate. - try { - const marker = JSON.parse(fs.readFileSync(markerFile, "utf8")) as { threadId?: string }; - if (marker?.threadId && hasPrompt) { - deliverSiriPrompt(marker.threadId, parsed.prompt as string, requestId); + if ( + (parsed.agentId != null && typeof parsed.agentId !== "string") || + (parsed.prompt != null && typeof parsed.prompt !== "string") + ) + return null; + const markerFile = + orderedDirs + .map((candidate) => resolve(join(candidate, `.done-${requestId}.json`))) + .find((candidate) => fs.existsSync(candidate)) ?? + resolve(join(dir, `.done-${requestId}.json`)); + const receipt = await requests.submit( + id, + { + kind: "siri", + projectId: parsed.projectId, + agentId: parsed.agentId ?? null, + prompt: parsed.prompt ?? "", + }, + async () => { + // Old builds could have sent the prompt without confirming delivery. + // Preserve their thread, but never replay that ambiguous request. + if (fs.existsSync(markerFile)) { + const marker = JSON.parse(fs.readFileSync(markerFile, "utf8")) as { + threadId?: string; + delivered?: boolean; + }; + if (!marker.threadId || !getThread(marker.threadId)) + throw new Error( + "An older Siri request could not be recovered. Check Pipper before starting another task.", + ); + return { + threadId: marker.threadId, + result: { ok: true }, + execute: async () => { + if (!marker.delivered) + throw new Error( + "This Siri request was handled by an older Pipper version. Check its thread before resending the task; delivery could not be confirmed.", + ); + }, + }; } - fs.rmSync(file, { force: true }); - fs.rmSync(markerFile, { force: true }); - return marker?.threadId ? getThread(marker.threadId) : null; - } catch { - return null; - } - } - const thread = await manager.createThread( - parsed.projectId, - hasPrompt ? (parsed.prompt as string).slice(0, 80) : null, - null, - parsed.agentId || null, - null, + return prepareIsolatedAgentTask( + requireAgentManager(), + parsed.projectId, + parsed.agentId, + parsed.prompt ?? "", + ); + }, ); - const threadId = (thread as { id?: string })?.id ?? null; - if (threadId) { - fs.writeFileSync(markerFile, JSON.stringify({ threadId }), "utf8"); + if (receipt.threadId) { + // The receipt now owns recovery, so staged prompt replicas can be removed. + finalizeSiriRequest(file, markerFile, dir, requestId); + return getThread(receipt.threadId); + } + throw new Error(receipt.error ?? "Siri request is still being prepared."); +} + +/** + * Remove a consumed request and its marker, then clean up replicas in the + * other candidate directories. Safe to call more than once. + */ +function finalizeSiriRequest( + file: string, + markerFile: string, + dir: string, + requestId: string, +): void { + try { + fs.rmSync(file, { force: true }); + } catch { + // Best-effort. } - if (threadId && hasPrompt) { - deliverSiriPrompt(threadId, parsed.prompt as string, requestId); + try { + fs.rmSync(markerFile, { force: true }); + } catch { + // Best-effort. } - fs.rmSync(file, { force: true }); - // Remove stale replicas in other dirs only after full success. - const { getSiriRequestsDirs: getDirs } = await import("./siri/siri-catalog.ts"); - for (const rawDir of getDirs()) { + void cleanupSiriRequestReplicas(dir, requestId); +} + +async function cleanupSiriRequestReplicas(dir: string, requestId: string): Promise { + const { getSiriRequestsDirs } = await import("./siri/siri-catalog.ts"); + for (const rawDir of getSiriRequestsDirs()) { const otherDir = resolve(rawDir); if (otherDir === dir) continue; try { @@ -575,22 +630,6 @@ async function consumeSiriRequestInner(requestId: string): Promise { // Best-effort replica cleanup. } } - if (threadId) fs.rmSync(markerFile, { force: true }); - return thread; -} - -/** - * Hand the prompt to the agent without awaiting the turn. `sendPrompt` only - * resolves when the agent finishes (up to ACP_PROMPT_TIMEOUT_MS), so awaiting - * it from the startup path blocked window creation until the agent was done. - * The thread already exists and is opened; a delivery failure is logged. - */ -function deliverSiriPrompt(threadId: string, message: string, requestId: string): void { - void requireAgentManager() - .sendPrompt({ threadId, message }) - .catch((err) => { - console.error(`[Main] Siri request ${requestId}: prompt delivery failed:`, err); - }); } async function openSiriThread(thread: unknown): Promise { @@ -615,7 +654,9 @@ async function openSiriThread(thread: unknown): Promise { async function consumePendingSiriRequests(): Promise { if (!agentManager) return; const { getSiriRequestsDirs } = await import("./siri/siri-catalog.ts"); - const seen = new Map(); + // Key by request id, but keep the winning replica's dir so the consume + // step reads the newest copy rather than whichever dir is listed first. + const seen = new Map(); for (const rawDir of getSiriRequestsDirs()) { const dir = resolve(rawDir); if (!fs.existsSync(dir)) continue; @@ -623,17 +664,17 @@ async function consumePendingSiriRequests(): Promise { if (!entry.isFile() || !/^[A-Za-z0-9-]{1,128}\.json$/.test(entry.name)) continue; const requestId = entry.name.slice(0, -5); const mtimeMs = fs.statSync(join(dir, entry.name)).mtimeMs; - if (!seen.has(requestId) || mtimeMs > (seen.get(requestId) ?? 0)) - seen.set(requestId, mtimeMs); + const previous = seen.get(requestId); + if (!previous || mtimeMs > previous.mtimeMs) seen.set(requestId, { mtimeMs, dir }); } } const requests = [...seen.entries()] - .map(([requestId, mtimeMs]) => ({ requestId, mtimeMs })) + .map(([requestId, info]) => ({ requestId, mtimeMs: info.mtimeMs, dir: info.dir })) .sort((a, b) => a.mtimeMs - b.mtimeMs); - for (const { requestId } of requests) { + for (const { requestId, dir } of requests) { try { - const thread = await consumeSiriRequest(requestId); + const thread = await consumeSiriRequest(requestId, dir); if (thread) await openSiriThread(thread); } catch (error) { // Leave failed requests on disk so a later app activation can retry. diff --git a/electron/permission-coordinator.test.ts b/electron/permission-coordinator.test.ts index 582ac6c..584e051 100644 --- a/electron/permission-coordinator.test.ts +++ b/electron/permission-coordinator.test.ts @@ -5,7 +5,7 @@ import { PermissionCoordinator } from "./permission-coordinator.ts"; /** * Pending-permission lifecycle: requests surface as bridge events, settle via - * user response, timeout to allow_once, displace duplicates, and cancel when + * user response, timeout without approval, displace duplicates, and cancel when * their session goes away. */ @@ -79,14 +79,12 @@ describe("PermissionCoordinator", () => { }); }); - test("times out to allow_once so an agent never blocks forever", async () => { + test("expires unanswered prompts without approving them", async () => { const { coordinator, events } = makeCoordinator(); const promise = coordinator.handle(requestParams(), "r1"); await vi.advanceTimersByTimeAsync(121_000); - await expect(promise).resolves.toEqual({ - outcome: { outcome: "selected", optionId: "allow" }, - }); + await expect(promise).resolves.toEqual({ outcome: { outcome: "cancelled" } }); expect(events.at(-1)?.type).toBe("permission-resolved"); }); @@ -133,4 +131,21 @@ describe("PermissionCoordinator", () => { await expect(coordinator.handle(requestParams(), "r1")).resolves.toBe(auto); expect(events).toEqual([]); }); + test("remote decisions validate thread ownership, options and stale request generations", async () => { + const { coordinator } = makeCoordinator(); + const first = coordinator.handle(requestParams(), "r1"); + const decision = coordinator.listForThread("t1")[0]!; + expect(coordinator.listForThread("another-thread")).toEqual([]); + expect(await coordinator.respondForThread("another-thread", decision.id, "allow")).toBe(false); + expect(await coordinator.respondForThread("t1", decision.id, "invented")).toBe(false); + const replacement = coordinator.handle(requestParams(), "r1"); + await expect(first).resolves.toEqual({ outcome: { outcome: "cancelled" } }); + expect(await coordinator.respondForThread("t1", decision.id, "allow")).toBe(false); + const current = coordinator.listForThread("t1")[0]!; + expect(await coordinator.respondForThread("t1", current.id, "deny")).toBe(true); + await expect(replacement).resolves.toEqual({ + outcome: { outcome: "selected", optionId: "deny" }, + }); + expect(await coordinator.respondForThread("t1", current.id, "deny")).toBe(false); + }); }); diff --git a/electron/permission-coordinator.ts b/electron/permission-coordinator.ts index 9f3f3ed..a49ba8b 100644 --- a/electron/permission-coordinator.ts +++ b/electron/permission-coordinator.ts @@ -1,11 +1,14 @@ +import { randomUUID } from "node:crypto"; +import type { RemotePermission } from "../contracts/remote.ts"; import type * as acp from "@agentclientprotocol/sdk"; import type { AcpBridgeEvent, AcpPermissionRequest } from "../contracts/acp.ts"; import type { AgentOsNotification } from "./os-notifications.ts"; -/** Default allow_once after this long if the UI never responds. */ +/** Unanswered decisions expire without granting permission. */ const PERMISSION_TIMEOUT_MS = 120_000; interface PendingPermission { + decisionId: string; resolve: (response: acp.RequestPermissionResponse) => void; request: AcpPermissionRequest; timer: ReturnType; @@ -66,15 +69,8 @@ export class PermissionCoordinator { const timer = setTimeout(() => { const pending = this.pending.get(key); if (!pending) return; - const allow = request.options.find((o) => o.kind === "allow_once") ?? request.options[0]; this.pending.delete(key); - if (allow) { - resolve({ - outcome: { outcome: "selected", optionId: allow.optionId }, - }); - } else { - resolve({ outcome: { outcome: "cancelled" } }); - } + resolve({ outcome: { outcome: "cancelled" } }); this.deps.emit({ type: "permission-resolved", sessionId, requestId: stableRequestId }); }, PERMISSION_TIMEOUT_MS); const displaced = this.pending.get(key); @@ -83,7 +79,7 @@ export class PermissionCoordinator { displaced.resolve({ outcome: { outcome: "cancelled" } }); this.deps.emit({ type: "permission-resolved", sessionId, requestId: stableRequestId }); } - this.pending.set(key, { resolve, request, timer }); + this.pending.set(key, { decisionId: randomUUID(), resolve, request, timer }); this.deps.emit({ type: "permission-request", request }); // An agent blocked on permissions while the user is away is dead time; // the in-app prompt cannot be seen, so escalate to the OS. @@ -98,6 +94,40 @@ export class PermissionCoordinator { }); } + listForThread(threadId: string): RemotePermission[] { + return [...this.pending.values()] + .filter((p) => p.request.threadId === threadId) + .map((p) => ({ + id: p.decisionId, + title: p.request.toolCall.title ?? "Agent needs your input", + detail: + p.request.toolCall.rawInput == null + ? null + : JSON.stringify(p.request.toolCall.rawInput).slice(0, 8000), + options: p.request.options.map((o) => ({ ...o })), + })); + } + + async respondForThread( + threadId: string, + decisionId: string, + optionId?: string, + cancelled = false, + ): Promise { + const pending = [...this.pending.values()].find( + (p) => p.decisionId === decisionId && p.request.threadId === threadId, + ); + if (!pending) return false; + if (!cancelled && !pending.request.options.some((o) => o.optionId === optionId)) return false; + await this.respond({ + sessionId: pending.request.sessionId, + requestId: pending.request.requestId, + optionId, + cancelled, + }); + return true; + } + async respond(response: { sessionId: string; requestId?: string | number; diff --git a/electron/remote-requests.test.ts b/electron/remote-requests.test.ts new file mode 100644 index 0000000..1280916 --- /dev/null +++ b/electron/remote-requests.test.ts @@ -0,0 +1,57 @@ +import { mkdtempSync, rmSync, readdirSync, readFileSync, writeFileSync } from "node:fs"; +import { tmpdir } from "node:os"; +import { join } from "node:path"; +import { afterEach, beforeEach, expect, it, vi } from "vitest"; +import { RemoteRequests } from "./remote-requests.ts"; + +let dir: string; +beforeEach(() => { + dir = mkdtempSync(join(tmpdir(), "remote-receipts-")); +}); +afterEach(() => rmSync(dir, { recursive: true, force: true })); + +it("recovers accepted results after restart without dispatching again", async () => { + const first = new RemoteRequests(dir); + const execute = vi.fn(async () => {}); + const prepare = vi.fn(async () => ({ + threadId: "t1", + result: { thread: { id: "t1" } }, + execute, + })); + await first.submit("r1", { prompt: "private prompt" }, prepare); + await vi.waitFor(() => expect(first.get("r1")?.state).toBe("completed")); + const restarted = new RemoteRequests(dir); + expect((await restarted.submit("r1", { prompt: "private prompt" }, prepare)).result).toEqual({ + thread: { id: "t1" }, + }); + expect(prepare).toHaveBeenCalledTimes(1); + expect(execute).toHaveBeenCalledTimes(1); + expect(readFileSync(join(dir, readdirSync(dir)[0]!), "utf8")).not.toContain("private prompt"); +}); + +it("never replays an uncertain dispatch after restart", async () => { + const execute = vi.fn(() => new Promise(() => {})); + const prepare = vi.fn(async () => ({ threadId: "t1", result: { ok: true }, execute })); + await new RemoteRequests(dir).submit("r1", "payload", prepare); + const retry = await new RemoteRequests(dir).submit("r1", "payload", prepare); + expect(retry.state).toBe("interrupted"); + expect(retry.threadId).toBe("t1"); + expect(retry.error).toContain("will not run again"); + expect(execute).toHaveBeenCalledTimes(1); +}); + +it("does not repeat creation after a crash before a thread ID was recorded", async () => { + const prepare = vi.fn(() => new Promise(() => {})); + void new RemoteRequests(dir).submit("r1", "payload", prepare); + const retry = await new RemoteRequests(dir).submit("r1", "payload", prepare); + expect(retry.state).toBe("interrupted"); + expect(retry.threadId).toBeNull(); + expect(prepare).toHaveBeenCalledTimes(1); +}); + +it("fails closed if request storage cannot be read", async () => { + writeFileSync(join(dir, "r1.json"), "broken JSON"); + const prepare = vi.fn(); + await expect(new RemoteRequests(dir).submit("r1", "payload", prepare)).rejects.toThrow(); + expect(prepare).not.toHaveBeenCalled(); +}); diff --git a/electron/remote-requests.ts b/electron/remote-requests.ts new file mode 100644 index 0000000..b41f3e9 --- /dev/null +++ b/electron/remote-requests.ts @@ -0,0 +1,188 @@ +import { createHash } from "node:crypto"; +import { mkdirSync, readFileSync, readdirSync, renameSync, writeFileSync } from "node:fs"; +import { join } from "node:path"; +import type { RemoteRequestStatus } from "../contracts/remote.ts"; + +interface Receipt extends RemoteRequestStatus { + fingerprint: string; + result: Record | null; + createdAt: number; +} + +export class RemoteRequestError extends Error { + readonly status: number; + constructor(status: number, message: string) { + super(message); + this.status = status; + } +} + +/** Durable at-most-once dispatch. An interrupted dispatch is never replayed: + * ACP has no idempotency key, so after a crash we cannot prove it didn't run. + * Receipts retain payload hashes and response metadata, not full prompt payloads. + */ +export class RemoteRequests { + private receipts: Map | null = null; + private readonly preparing = new Map>(); + private readonly active = new Set(); + private lastCreatedAt = 0; + + private readonly directory: string; + constructor(directory: string) { + this.directory = directory; + } + + private all(): Map { + if (this.receipts) return this.receipts; + mkdirSync(this.directory, { recursive: true, mode: 0o700 }); + const receipts = new Map(); + for (const name of readdirSync(this.directory)) { + if (!/^[A-Za-z0-9-]{1,128}\.json$/.test(name)) continue; + // Fail closed on corrupt storage; never discard a deduplication record. + const receipt = JSON.parse(readFileSync(join(this.directory, name), "utf8")) as Receipt; + if (receipt.id !== name.slice(0, -5) || !receipt.fingerprint) { + throw new Error("Remote request history is unreadable. Check Pipper on your Mac."); + } + receipts.set(receipt.id, receipt); + this.lastCreatedAt = Math.max(this.lastCreatedAt, receipt.createdAt ?? receipt.updatedAt); + } + this.receipts = receipts; + return receipts; + } + + private save(receipt: Receipt): void { + const file = join(this.directory, `${receipt.id}.json`); + writeFileSync(`${file}.tmp`, JSON.stringify(receipt), { mode: 0o600, flush: true }); + renameSync(`${file}.tmp`, file); + this.all().set(receipt.id, receipt); + } + + private recovered(receipt: Receipt): Receipt { + if ( + (receipt.state === "preparing" || receipt.state === "running") && + !this.active.has(receipt.id) + ) { + return { + ...receipt, + state: "interrupted", + error: + "Pipper restarted before this request was confirmed. Check the thread on your Mac before starting another task. This request will not run again.", + }; + } + return receipt; + } + + get(id: string): Receipt | null { + const receipt = this.all().get(id); + return receipt ? this.recovered(receipt) : null; + } + + latestForThread(threadId: string): RemoteRequestStatus | null { + const receipt = [...this.all().values()] + .filter((r) => r.threadId === threadId) + .sort((a, b) => (b.createdAt ?? b.updatedAt) - (a.createdAt ?? a.updatedAt))[0]; + return receipt ? this.status(this.recovered(receipt)) : null; + } + + status(receipt: Receipt): RemoteRequestStatus { + const { id, threadId, state, error, updatedAt } = receipt; + return { id, threadId, state, error, updatedAt }; + } + + async submit( + id: unknown, + payload: unknown, + prepare: () => Promise<{ + threadId: string; + result: Record; + execute: () => Promise; + }>, + ): Promise { + if (typeof id !== "string" || !/^[A-Za-z0-9-]{1,128}$/.test(id)) { + throw new RemoteRequestError( + 400, + "A requestId is required. Update the phone app and try again.", + ); + } + const fingerprint = createHash("sha256").update(JSON.stringify(payload)).digest("hex"); + const previous = this.all().get(id); + if (previous) { + if (previous.fingerprint !== fingerprint) { + throw new RemoteRequestError(409, "This request ID already belongs to a different task."); + } + return this.preparing.get(id) ?? this.recovered(previous); + } + const createdAt = Math.max(Date.now(), this.lastCreatedAt + 1); + this.lastCreatedAt = createdAt; + const receipt: Receipt = { + id, + fingerprint, + threadId: null, + state: "preparing", + error: null, + result: null, + updatedAt: Date.now(), + createdAt, + }; + // Claim before ANY worktree/session/prompt side effect. + this.save(receipt); + this.active.add(id); + const task = (async () => { + try { + const prepared = await prepare(); + const accepted: Receipt = { + ...receipt, + threadId: prepared.threadId, + result: prepared.result, + state: "running", + updatedAt: Date.now(), + }; + this.save(accepted); + // Store acceptance before dispatch; respond without waiting for the turn. + void Promise.resolve() + .then(prepared.execute) + .then( + () => this.settle(accepted, null), + (error: unknown) => this.settle(accepted, error), + ) + .catch((error) => console.error("[Remote] Could not persist request outcome:", error)) + .finally(() => this.active.delete(id)); + return accepted; + } catch (error) { + this.active.delete(id); + const failed: Receipt = { + ...receipt, + state: "failed", + updatedAt: Date.now(), + error: error instanceof Error ? error.message : String(error), + }; + this.save(failed); + return failed; + } finally { + this.preparing.delete(id); + } + })(); + this.preparing.set(id, task); + return task; + } + + private settle(receipt: Receipt, error: unknown): void { + this.save({ + ...receipt, + state: error == null ? "completed" : "failed", + updatedAt: Date.now(), + error: error == null ? null : error instanceof Error ? error.message : String(error), + }); + } +} + +// HTTP and Mac Siri share the same in-process ownership of the durable journal. +const stores = new Map(); +export function getRemoteRequests(directory: string): RemoteRequests { + let store = stores.get(directory); + if (!store) { + store = new RemoteRequests(directory); + stores.set(directory, store); + } + return store; +} diff --git a/electron/remote-server.test.ts b/electron/remote-server.test.ts index b98cd3d..886b882 100644 --- a/electron/remote-server.test.ts +++ b/electron/remote-server.test.ts @@ -16,6 +16,23 @@ const catalog = { ], }; +const mocks = vi.hoisted(() => ({ + threads: new Map< + string, + { + id: string; + project_id: string; + worktree_path: string | null; + title: string; + last_used_at: number; + } + >(), + createWorktree: vi.fn(), + removeWorktreeBestEffort: vi.fn(), + isLiveWorktree: vi.fn(), +})); +let manager: Record> | null = null; + vi.mock("./siri/siri-catalog.ts", () => ({ buildSiriCatalog: () => catalog })); vi.mock("./projects.ts", () => ({ listProjects: () => catalog.projects, @@ -24,26 +41,46 @@ vi.mock("./projects.ts", () => ({ vi.mock("./agents/registry.ts", () => ({ listRegisteredAgents: () => catalog.agents.map((a) => ({ id: a.id, displayName: a.displayName })), })); -vi.mock("./threads.ts", () => ({ listThreads: () => [], getThread: () => null })); +vi.mock("./threads.ts", () => ({ + listThreads: () => [...mocks.threads.values()], + getThread: (id: string) => mocks.threads.get(id) ?? null, +})); vi.mock("./worktree-manager.ts", () => ({ - createWorktree: () => { - throw new Error("not in test"); - }, - removeWorktree: () => {}, + createWorktree: mocks.createWorktree, + removeWorktreeBestEffort: mocks.removeWorktreeBestEffort, + isLiveWorktree: mocks.isLiveWorktree, gitBinary: () => "git", })); import { RemoteServer } from "./remote-server.ts"; +import type { RemoteReport, RemoteThreadSummary } from "../contracts/remote.ts"; +function responseBody(response: Response): Promise<{ + thread: RemoteThreadSummary; + report: RemoteReport; + ok: boolean; + error: string; + retryable: boolean; +}> { + return response.json() as ReturnType; +} let userData: string; let server: RemoteServer; let base: string; beforeEach(async () => { + manager = null; + mocks.threads.clear(); + mocks.createWorktree + .mockReset() + .mockReturnValue({ path: "/tmp/isolated-test", branch: "phone-test" }); + mocks.removeWorktreeBestEffort.mockReset(); + mocks.isLiveWorktree.mockReset().mockReturnValue(true); userData = mkdtempSync(join(tmpdir(), "pipper-remote-test-")); server = new RemoteServer( { - agentManager: () => null, + agentManager: () => + manager as unknown as import("./agent-connection-manager.ts").AgentManager | null, getUserDataPath: () => userData, getRendererDir: () => userData, }, @@ -107,3 +144,159 @@ describe("GET /api/remote/catalog", () => { } }); }); + +function installAgent() { + manager = { + createThread: vi.fn(async (_project, title, _after, _agent, path) => { + const thread = { + id: `t${mocks.threads.size + 1}`, + project_id: "p1", + worktree_path: path, + title, + last_used_at: Date.now(), + }; + mocks.threads.set(thread.id, thread); + return thread; + }), + sendPrompt: vi.fn(async () => {}), + abortThread: vi.fn(async () => {}), + getRunningThreadIds: vi.fn(() => []), + getThreadTranscript: vi.fn(() => ({ finalText: null, messages: [] })), + getRemotePermissions: vi.fn(() => []), + respondToRemotePermission: vi.fn(async () => true), + }; + return manager; +} + +const input = { + requestId: "request-1", + projectId: "p1", + modelId: "codex-acp", + prompt: "Fix login", +}; +function post(path: string, body: unknown, token = "test-token") { + return fetch(`${base}/api/remote/${path}`, { + method: "POST", + headers: { Authorization: `Bearer ${token}`, "Content-Type": "application/json" }, + body: JSON.stringify(body), + }); +} + +it("deduplicates concurrent creation and returns the original thread on retry", async () => { + const am = installAgent(); + const responses = await Promise.all([post("threads", input), post("threads", input)]); + expect(responses.map((r) => r.status)).toEqual([202, 202]); + const bodies = await Promise.all(responses.map(responseBody)); + expect(bodies[0].thread.id).toBe(bodies[1].thread.id); + const retry = await responseBody(await post("threads", input)); + expect(retry.thread.id).toBe(bodies[0].thread.id); + expect(am.createThread).toHaveBeenCalledTimes(1); + expect(am.sendPrompt).toHaveBeenCalledTimes(1); + expect(mocks.createWorktree).toHaveBeenCalledTimes(1); +}); + +it("rejects missing or conflicting IDs without side effects", async () => { + const am = installAgent(); + expect((await post("threads", { ...input, requestId: undefined })).status).toBe(400); + await post("threads", input); + expect((await post("threads", { ...input, prompt: "Different task" })).status).toBe(409); + expect(am.sendPrompt).toHaveBeenCalledTimes(1); +}); + +it("never runs in the project root when worktree creation fails", async () => { + const am = installAgent(); + mocks.createWorktree.mockImplementation(() => { + throw new Error("no commits"); + }); + const response = await post("threads", input); + expect(response.status).toBe(409); + const rejection = await responseBody(response); + expect(rejection.error).toContain("No task was started"); + expect(rejection.retryable).toBe(true); + expect(am.createThread).not.toHaveBeenCalled(); + expect(am.sendPrompt).not.toHaveBeenCalled(); +}); + +it("permits a new attempt after a confirmed pre-dispatch rejection, while preserving the old receipt", async () => { + const am = installAgent(); + mocks.createWorktree.mockImplementationOnce(() => { + throw new Error("no commits"); + }); + expect((await post("threads", input)).status).toBe(409); + // A lost failure response followed by retry never changes the old outcome. + expect((await post("threads", input)).status).toBe(409); + expect(am.sendPrompt).not.toHaveBeenCalled(); + expect((await post("threads", { ...input, requestId: "new-attempt" })).status).toBe(202); + expect(am.sendPrompt).toHaveBeenCalledTimes(1); +}); + +it("does not dispatch if the agent fails to bind the requested worktree", async () => { + const am = installAgent(); + am.createThread.mockResolvedValue({ id: "bad", project_id: "p1", worktree_path: null }); + expect((await post("threads", input)).status).toBe(409); + expect(am.sendPrompt).not.toHaveBeenCalled(); +}); + +it("acknowledges follow-ups before the turn completes and records asynchronous failure", async () => { + const am = installAgent(); + await post("threads", input); + let rejectTurn!: (error: Error) => void; + am.sendPrompt.mockImplementation( + () => + new Promise((_resolve, reject) => { + rejectTurn = reject; + }), + ); + const response = await post("threads/t1/prompt", { requestId: "followup-1", prompt: "Continue" }); + expect(response.status).toBe(202); + expect((await responseBody(response)).ok).toBe(true); + await post("threads/t1/prompt", { requestId: "followup-1", prompt: "Continue" }); + expect(am.sendPrompt).toHaveBeenCalledTimes(2); // initial + one follow-up + rejectTurn(new Error("Agent disconnected")); + await new Promise((resolve) => setTimeout(resolve, 0)); + const report = await fetch(`${base}/api/remote/threads/t1/report`, { + headers: { Authorization: "Bearer test-token" }, + }); + expect((await responseBody(report)).report.request?.error).toBe("Agent disconnected"); +}); + +it("refuses follow-ups after the worktree disappears", async () => { + const am = installAgent(); + await post("threads", input); + mocks.isLiveWorktree.mockReturnValue(false); + expect( + (await post("threads/t1/prompt", { requestId: "followup-1", prompt: "Continue" })).status, + ).toBe(409); + expect(am.sendPrompt).toHaveBeenCalledTimes(1); +}); + +it("authenticates controls and scopes answers and cancellation to the named thread", async () => { + const am = installAgent(); + await post("threads", input); + expect((await post("threads/t1/stop", {}, "wrong-token")).status).toBe(401); + expect(am.abortThread).not.toHaveBeenCalled(); + expect((await post("threads/t1/stop", {})).status).toBe(200); + expect(am.abortThread).toHaveBeenCalledWith("t1"); + expect((await post("threads/t1/permission", { decisionId: "d1", optionId: "deny" })).status).toBe( + 200, + ); + expect(am.respondToRemotePermission).toHaveBeenCalledWith("t1", "d1", "deny", false); + am.respondToRemotePermission.mockResolvedValue(false); + expect( + (await post("threads/t1/permission", { decisionId: "expired", optionId: "allow" })).status, + ).toBe(409); +}); + +it("checks authentication and agent availability separately from public health", async () => { + const unauthorized = await fetch(`${base}/api/remote/diagnostics`); + expect(unauthorized.status).toBe(401); + const response = await fetch(`${base}/api/remote/diagnostics`, { + headers: { Authorization: "Bearer test-token" }, + }); + expect(await response.json()).toEqual({ + paired: true, + agentReady: false, + availableAgents: 1, + projects: 1, + }); +}); diff --git a/electron/remote-server.ts b/electron/remote-server.ts index ddb4e52..a4dbcf7 100644 --- a/electron/remote-server.ts +++ b/electron/remote-server.ts @@ -10,7 +10,9 @@ import { listProjects, getProject } from "./projects.ts"; import { listRegisteredAgents } from "./agents/registry.ts"; import { buildSiriCatalog } from "./siri/siri-catalog.ts"; import { getThread, listThreads } from "./threads.ts"; -import { createWorktree, gitBinary, removeWorktreeBestEffort } from "./worktree-manager.ts"; +import { prepareIsolatedAgentTask } from "./isolated-agent-task.ts"; +import { RemoteRequestError, RemoteRequests, getRemoteRequests } from "./remote-requests.ts"; +import { gitBinary, isLiveWorktree } from "./worktree-manager.ts"; import type { RemoteModel, RemoteProject, @@ -125,11 +127,12 @@ export class RemoteServer { private token: string; readonly port: number; private readonly deps: RemoteServerDeps; - private readonly isolationNotes = new Map(); + private readonly requests: RemoteRequests; private lastAuthedAt = 0; constructor(deps: RemoteServerDeps, opts?: { port?: number; token?: string }) { this.deps = deps; + this.requests = getRemoteRequests(join(deps.getUserDataPath(), "remote-requests")); this.port = opts?.port ?? Number(process.env.PIPPER_REMOTE_PORT ?? 4173); // Stable pairing token: env override, else persisted per userData dir so a // relaunch doesn't invalidate the phone's saved token. @@ -247,13 +250,6 @@ export class RemoteServer { } /** True when a thread row already binds this worktree (keep it for retry). */ - private threadExistsForWorktree(worktreePath: string): boolean { - try { - return listThreads().some((t) => t.worktree_path === worktreePath); - } catch { - return true; - } - } private authed(req: http.IncomingMessage): boolean { const header = req.headers.authorization ?? ""; @@ -361,117 +357,137 @@ export class RemoteServer { this.deps.onRemoteActiveChanged?.(running.size > 0 || this.hasLiveLease()); return send(res, 200, { threads: summaries }); } + if (req.method === "GET" && path === "/api/remote/diagnostics") { + const catalog = buildSiriCatalog(); + return sendReport(res, { + paired: true, + agentReady: am != null, + availableAgents: catalog.agents.filter((a) => a.available).length, + projects: catalog.projects.length, + }); + } + const requestMatch = path.match(/^\/api\/remote\/requests\/([A-Za-z0-9-]{1,128})$/); + if (req.method === "GET" && requestMatch) { + const receipt = this.requests.get(requestMatch[1]!); + return receipt + ? sendReport(res, { request: this.requests.status(receipt) }) + : send(res, 404, { error: "Request not found" }); + } if (req.method === "POST" && path === "/api/remote/threads") { - if (!am) return send(res, 503, { error: "Agent not ready" }); const body = JSON.parse((await readBody(req)) || "{}") as { + requestId?: string; projectId?: string; modelId?: string | null; prompt?: string; }; - if (!body.projectId || !body.prompt?.trim()) { + if ( + typeof body.projectId !== "string" || + typeof body.prompt !== "string" || + !body.prompt.trim() || + (body.modelId != null && typeof body.modelId !== "string") + ) { return send(res, 400, { error: "projectId and prompt are required" }); } - const project = getProject(body.projectId); - if (!project) return send(res, 404, { error: "Project not found" }); - // Every new phone chat = fresh worktree + fresh thread, invisible to user. - // If the repo can't take a worktree (e.g. no commits yet), fall back - // to the project root so the task still runs. - let worktreePath: string | null = null; - let worktreeBranch: string | null = null; - let isolationNote: string | null = null; - try { - // Fixed-length random name: never derived from the prompt text, so - // long/unicode/identical prompts can't produce ugly, colliding, or - // confusing worktree + branch names. `phone-` prefix keeps the - // origin identifiable in `git worktree list`. - let created = null; - let lastError: unknown = null; - for (let attempt = 0; attempt < 5 && !created; attempt++) { - const slug = `phone-${randomBytes(4).toString("hex")}`; - try { - created = createWorktree({ - projectPath: project.path, - projectId: project.id, - name: slug, - }); - } catch (err) { - lastError = err; - } - } - if (!created) throw lastError ?? new Error("worktree creation failed"); - worktreePath = created.path; - worktreeBranch = created.branch; - console.log(`[Remote] worktree created: ${worktreePath}`); - } catch (err) { - isolationNote = err instanceof Error ? err.message : String(err); - console.warn(`[Remote] worktree fallback to project root: ${isolationNote}`); - } - console.log( - `[Remote] new phone thread project=${project.id} worktree=${worktreePath ?? ""} promptLen=${body.prompt.length}`, + const { projectId } = body; + const prompt = body.prompt.trim(); + const receipt = await this.requests.submit( + body.requestId, + { kind: "create", projectId, agentId: body.modelId ?? null, prompt }, + async () => { + if (!am) throw new Error("Pipper is still starting on your Mac. No task was started."); + return prepareIsolatedAgentTask(am, projectId, body.modelId, prompt); + }, ); - // modelId from the phone is an *agent* id (listRegisteredAgents). - // Use it to pick the connection, but never as a model name — the - // agent's own default model applies (e.g. antigravity has no implicit - // default; the user's desktop default is used). - try { - const thread = await am.createThread( - project.id, - body.prompt.slice(0, 80), - null, - body.modelId ?? null, - worktreePath, - null, - { background: true }, - ); - if (isolationNote) this.isolationNotes.set(thread.id, isolationNote); - console.log( - `[Remote] prompt accepted thread=${thread.id} boundWorktree=${thread.worktree_path ?? ""}`, - ); - if (!thread.worktree_path) { - console.warn( - `[Remote] thread=${thread.id} running on PROJECT ROOT (no isolated workspace). ` + - `requested=${worktreePath ?? ""} reason=${isolationNote ?? "worktree rejected as not-live"}`, - ); - } - // Respond before the turn runs so the phone shows progress - // immediately; the turn streams into the thread in the background - // and the report poll picks it up. A prompt failure is logged - // server-side — the phone sees an idle thread with no reply. - const prompt = body.prompt; - void am - .sendPrompt({ threadId: thread.id, message: prompt }, { background: true }) - .then(() => console.log(`[Remote] turn completed thread=${thread.id}`)) - .catch((promptError) => { - console.error(`[Remote] prompt failed, keeping thread=${thread.id}:`, promptError); - }); - return send(res, 201, { - thread: { - id: thread.id, - projectId: thread.project_id, - worktreePath: thread.worktree_path ?? null, - title: thread.title, - running: true, - lastUsedAt: thread.last_used_at, - }, - }); - } catch (error) { - // Roll back the worktree only when thread creation itself failed — - // once the thread row exists the worktree is retained for retry. - if (worktreePath && !this.threadExistsForWorktree(worktreePath)) { - console.warn(`[Remote] rolling back worktree: ${worktreePath}`); - removeWorktreeBestEffort(project.path, worktreePath, worktreeBranch); - } - throw error; - } + return send(res, receipt.result ? 202 : 409, { + ...receipt.result, + request: this.requests.status(receipt), + ...(receipt.result + ? {} + : { + error: receipt.error ?? "Request is still being prepared.", + retryable: receipt.state === "failed", + }), + }); } const promptMatch = path.match(/^\/api\/remote\/threads\/([^/]+)\/prompt$/); if (req.method === "POST" && promptMatch) { + const threadId = promptMatch[1]!; + const body = JSON.parse((await readBody(req)) || "{}") as { + requestId?: string; + prompt?: string; + }; + if (typeof body.prompt !== "string" || !body.prompt.trim()) + return send(res, 400, { error: "prompt is required" }); + const prompt = body.prompt.trim(); + const receipt = await this.requests.submit( + body.requestId, + { kind: "prompt", threadId, prompt }, + async () => { + if (!am) throw new Error("Pipper is still starting on your Mac."); + const thread = getThread(threadId); + const project = thread ? getProject(thread.project_id) : null; + if ( + !thread?.worktree_path || + !project || + !isLiveWorktree(thread.worktree_path, project.path) + ) { + throw new Error( + "This thread has no live isolated workspace. Restore its worktree on your Mac, or start a new thread.", + ); + } + return { + threadId, + result: { ok: true }, + execute: () => + am.sendPrompt( + { threadId, message: prompt }, + { background: true, requireWorktree: true }, + ), + }; + }, + ); + return send(res, receipt.result ? 202 : 409, { + ...receipt.result, + request: this.requests.status(receipt), + ...(receipt.result + ? {} + : { + error: receipt.error ?? "Request is still being prepared.", + retryable: receipt.state === "failed", + }), + }); + } + const controlMatch = path.match(/^\/api\/remote\/threads\/([^/]+)\/(stop|permission)$/); + if (req.method === "POST" && controlMatch) { if (!am) return send(res, 503, { error: "Agent not ready" }); - const thread = getThread(promptMatch[1]!); - if (!thread) return send(res, 404, { error: "Thread not found" }); - const body = JSON.parse((await readBody(req)) || "{}") as { prompt?: string }; - if (!body.prompt?.trim()) return send(res, 400, { error: "prompt is required" }); - await am.sendPrompt({ threadId: thread.id, message: body.prompt }, { background: true }); + const threadId = controlMatch[1]!; + if (!getThread(threadId)) return send(res, 404, { error: "Thread not found" }); + if (controlMatch[2] === "stop") { + await am.abortThread(threadId); + } else { + const body = JSON.parse((await readBody(req)) || "{}") as { + decisionId?: string; + optionId?: string; + cancelled?: boolean; + }; + if ( + typeof body.decisionId !== "string" || + (body.optionId != null && typeof body.optionId !== "string") || + (body.cancelled != null && typeof body.cancelled !== "boolean") + ) { + return send(res, 400, { error: "A valid decision and option are required" }); + } + const answered = await am.respondToRemotePermission( + threadId, + body.decisionId, + body.optionId, + body.cancelled === true, + ); + if (!answered) + return send(res, 409, { + error: "This decision expired or was already answered. Refresh the thread.", + }); + } return send(res, 200, { ok: true }); } const reportMatch = path.match(/^\/api\/remote\/threads\/([^/]+)\/report$/); @@ -491,14 +507,24 @@ export class RemoteServer { filesTouched: await filesTouched(cwd), worktreePath: thread.worktree_path ?? null, isolated: Boolean(thread.worktree_path), - isolationNote: this.isolationNotes.get(thread.id) ?? null, + isolationNote: null, + permissions: am?.getRemotePermissions(thread.id) ?? [], + request: this.requests.latestForThread(thread.id), }; return sendReport(res, { report }); } send(res, 404, { error: "Not found" }); } catch (error) { console.error(`[Remote] ${req.method} ${path} failed:`, error); - send(res, 500, { error: error instanceof Error ? error.message : String(error) }); + send( + res, + error instanceof RemoteRequestError + ? error.status + : error instanceof SyntaxError + ? 400 + : 500, + { error: error instanceof Error ? error.message : String(error) }, + ); } } diff --git a/electron/terminal-manager.test.ts b/electron/terminal-manager.test.ts index 0f9dd25..b454e35 100644 --- a/electron/terminal-manager.test.ts +++ b/electron/terminal-manager.test.ts @@ -54,4 +54,18 @@ describe("TerminalManager", () => { expect(result.text.startsWith("😀")).toBe(true); expect(result.truncated).toBe(true); }); + test("stopping one session leaves other sessions' terminals running", async () => { + const manager = new TerminalManager(); + const command = { command: process.execPath, args: ["-e", "setInterval(() => {}, 1000)"] }; + const target = manager.create({ ...command, sessionId: "phone-session" }); + const other = manager.create({ ...command, sessionId: "desktop-session" }); + try { + manager.killRunning("phone-session"); + await manager.waitForExit(target); + expect(manager.getOutput(target).exitStatus).not.toBeNull(); + expect(manager.getOutput(other).exitStatus).toBeNull(); + } finally { + manager.killAll(); + } + }); }); diff --git a/electron/terminal-manager.ts b/electron/terminal-manager.ts index 819a665..6ad5ab4 100644 --- a/electron/terminal-manager.ts +++ b/electron/terminal-manager.ts @@ -221,9 +221,9 @@ export class TerminalManager { } /** Kill all running processes without releasing (ids stay valid for output). */ - killRunning(): void { - for (const id of Array.from(this.terminals.keys())) { - this.kill(id); + killRunning(sessionId?: string): void { + for (const [id, terminal] of this.terminals) { + if (sessionId == null || terminal.sessionId === sessionId) this.kill(id); } } diff --git a/native/pipper-intents/README.md b/native/pipper-intents/README.md index aa8f922..85280a2 100644 --- a/native/pipper-intents/README.md +++ b/native/pipper-intents/README.md @@ -44,3 +44,15 @@ The registered phrases are: The App Intents extension target in this project is embedded into the packaged Electron app by `electron-builder.yml`. The preview app target remains useful for inspecting metadata independently. + +## Handoff reliability + +Starting a task from this extension requires macOS 15.2 or later, where +`OpenURLIntent` can open the ad-hoc-signed desktop app. Earlier versions report +an error before staging any request. The metadata's `openAppWhenRun` value stays +constant as required by App Intents. + +Electron claims staged request IDs in its durable remote request history before +creating an isolated worktree. Repeated activations reopen the same thread. +Interrupted or legacy delivery with an uncertain outcome is not replayed; +inspect the original thread before sending a new task. diff --git a/native/pipper-intents/Sources/PipperIntents.swift b/native/pipper-intents/Sources/PipperIntents.swift index 7563e95..e4d5a0e 100644 --- a/native/pipper-intents/Sources/PipperIntents.swift +++ b/native/pipper-intents/Sources/PipperIntents.swift @@ -8,9 +8,25 @@ enum SiriDiagnostics { category: "AppIntents" ) + /// File logging is a development aid: it adds disk I/O to every intent run + /// and can accumulate prompt metadata on user machines. Keep it for debug + /// builds only, with an explicit env override for release-build triage. + private static let fileLoggingEnabled: Bool = { + if ProcessInfo.processInfo.environment["PIPPER_INTENTS_FILE_LOG"] == "1" { return true } + #if DEBUG + return true + #else + return false + #endif + }() + + /// Cap the on-disk log so a long-running build can't grow it without bound. + /// Once exceeded, the file is reset with the newest line. + private static let maxFileLogBytes = 1 * 1024 * 1024 + static func log(_ message: String) { - let line = "[PipperIntents] \(message)\n" logger.info("\(message, privacy: .public)") + guard fileLoggingEnabled else { return } let url = SiriCatalogStore.realHomeDirectory() .appendingPathComponent("Library/pipper/intents-debug.log") @@ -19,14 +35,20 @@ enum SiriDiagnostics { at: url.deletingLastPathComponent(), withIntermediateDirectories: true ) - if FileManager.default.fileExists(atPath: url.path), + let data = Data("[PipperIntents] \(message)\n".utf8) + let size = + (try? FileManager.default.attributesOfItem(atPath: url.path))?[.size] as? Int ?? 0 + if size + data.count > maxFileLogBytes { + // Truncate rather than append: the log is a rolling diagnostic aid. + try data.write(to: url, options: .atomic) + } else if FileManager.default.fileExists(atPath: url.path), let handle = try? FileHandle(forWritingTo: url) { handle.seekToEndOfFile() - handle.write(Data(line.utf8)) + handle.write(data) try? handle.close() } else { - try Data(line.utf8).write(to: url, options: .atomic) + try data.write(to: url, options: .atomic) } } catch { logger.error("file log failed: \(error.localizedDescription, privacy: .public)") @@ -166,9 +188,33 @@ enum SiriCatalogLabels { return duplicates ? "\(project.name) (\(project.path))" : project.name } + /// Split a rendered label back into its base name and disambiguation suffix: + /// `"app (/tmp/a)"` → `("app", "/tmp/a")`, `"app"` → `("app", nil)`. + static func split(_ label: String) -> (base: String, suffix: String?) { + guard label.hasSuffix(")"), let open = label.range(of: " (", options: .backwards) + else { return (label, nil) } + let base = String(label[label.startIndex.. SiriCatalogProject? { if let byId = all.first(where: { $0.id == value }) { return byId } - return all.first(where: { projectLabel($0, in: all) == value }) + if let byLabel = all.first(where: { projectLabel($0, in: all) == value }) { return byLabel } + if let byPath = all.first(where: { $0.path == value }) { return byPath } + let (base, suffix) = split(value) + let named = all.filter { $0.name == base } + guard !named.isEmpty else { return nil } + if let suffix, let bySuffix = named.first(where: { $0.id == suffix || $0.path == suffix }) { + return bySuffix + } + return named.count == 1 ? named[0] : nil } static func agentLabel(_ agent: SiriCatalogAgent, in all: [SiriCatalogAgent]) -> String { @@ -176,9 +222,18 @@ enum SiriCatalogLabels { return duplicates ? "\(agent.displayName) (\(agent.id))" : agent.displayName } + /// Agent counterpart to `resolveProject`: tolerate a stored label whose + /// disambiguation suffix no longer matches the live catalog. static func resolveAgent(_ value: String, in all: [SiriCatalogAgent]) -> SiriCatalogAgent? { if let byId = all.first(where: { $0.id == value }) { return byId } - return all.first(where: { agentLabel($0, in: all) == value }) + if let byLabel = all.first(where: { agentLabel($0, in: all) == value }) { return byLabel } + let (base, suffix) = split(value) + let named = all.filter { $0.displayName == base } + guard !named.isEmpty else { return nil } + if let suffix, let bySuffix = named.first(where: { $0.id == suffix }) { + return bySuffix + } + return named.count == 1 ? named[0] : nil } } @@ -243,9 +298,9 @@ struct StartThreadIntent: AppIntent { "Starts a new thread in a Pipper project with a chosen agent.", categoryName: "Productivity" ) -static var isDiscoverable: Bool = true - // Ad-hoc-signed builds cannot use App Intents' host-app launch handshake. - // The result below opens the app's registered URL scheme instead. + static var isDiscoverable: Bool = true + // App Intents metadata requires a compile-time constant. Ad-hoc builds use + // OpenURLIntent instead of the host-app launch handshake. static var openAppWhenRun: Bool = false static func debugLog(_ message: String) { @@ -266,6 +321,10 @@ static var isDiscoverable: Bool = true } func perform() async throws -> some IntentResult & ProvidesDialog { + guard #available(macOS 15.2, *) else { + throw NSError(domain: "PipperIntents", code: 1, + userInfo: [NSLocalizedDescriptionKey: "Starting Pipper from Shortcuts requires macOS 15.2 or later. Open Pipper to start this task."]) + } Self.debugLog("perform entered") Self.debugLog("perform start projectId=\(projectId) agentId=\(agentId) promptLen=\(prompt.count)") Self.debugLog("candidateDirs=\(SiriCatalogStore.candidateDirs().map { $0.path })") @@ -340,37 +399,40 @@ static var isDiscoverable: Bool = true } } -// MARK: - Temporary bisect intent (no parameters, no entities) - -struct PingIntent: AppIntent { - static var title: LocalizedStringResource = "Ping Pipper" - static var description = IntentDescription( - "Temporary diagnostic action. Always succeeds.", - categoryName: "Productivity" - ) +// MARK: - Diagnostic intents (debug builds only) +// +// These exist to bisect App Intents failures and have no user value, so they +// must not be discoverable in release builds. + +#if DEBUG + struct PingIntent: AppIntent { + static var title: LocalizedStringResource = "Ping Pipper" + static var description = IntentDescription( + "Temporary diagnostic action. Always succeeds.", + categoryName: "Productivity" + ) - func perform() async throws -> some IntentResult & ProvidesDialog { - return .result(dialog: "Pipper is reachable.") + func perform() async throws -> some IntentResult & ProvidesDialog { + return .result(dialog: "Pipper is reachable.") + } } -} - -// MARK: - Temporary bisect intent (string parameter only, no entities) -struct PingWithTextIntent: AppIntent { - static var title: LocalizedStringResource = "Ping Pipper With Text" - static var description = IntentDescription( - "Temporary diagnostic action with a text parameter.", - categoryName: "Productivity" - ) + struct PingWithTextIntent: AppIntent { + static var title: LocalizedStringResource = "Ping Pipper With Text" + static var description = IntentDescription( + "Temporary diagnostic action with a text parameter.", + categoryName: "Productivity" + ) - @Parameter(title: "Task") var prompt: String? + @Parameter(title: "Task") var prompt: String? - func perform() async throws -> some IntentResult & ProvidesDialog { - StartThreadIntent.debugLog("pingWithText entered promptLen=\(prompt?.count ?? -1)") - // Static dialog: bisects interpolated-dialog failure vs parameter failure. - return .result(dialog: "Text received.") + func perform() async throws -> some IntentResult & ProvidesDialog { + StartThreadIntent.debugLog("pingWithText entered promptLen=\(prompt?.count ?? -1)") + // Static dialog: bisects interpolated-dialog failure vs parameter failure. + return .result(dialog: "Text received.") + } } -} +#endif // MARK: - Shortcuts registration (Siri phrases must contain applicationName) diff --git a/native/pipper-intents/Tests/PipperIntentsTests/PipperIntentsTests.swift b/native/pipper-intents/Tests/PipperIntentsTests/PipperIntentsTests.swift index 1a33d2b..5a52713 100644 --- a/native/pipper-intents/Tests/PipperIntentsTests/PipperIntentsTests.swift +++ b/native/pipper-intents/Tests/PipperIntentsTests/PipperIntentsTests.swift @@ -44,6 +44,37 @@ struct PipperIntentsTests { } } + @Test func savedProjectLabelsSurviveDisambiguationChanges() { + let projects = [ + SiriCatalogProject(id: "p1", name: "app", path: "/tmp/a"), + SiriCatalogProject(id: "p2", name: "other", path: "/tmp/b"), + ] + // Saved while a duplicate "app" existed, so the label carried the path. + #expect(SiriCatalogLabels.resolveProject("app (/tmp/a)", in: projects)?.id == "p1") + // Saved before the project moved: only the label's suffix is stale, but + // the base name is still unique, so it resolves. + #expect(SiriCatalogLabels.resolveProject("other (/old)", in: projects)?.id == "p2") + // Raw ids and raw paths keep working. + #expect(SiriCatalogLabels.resolveProject("p1", in: projects)?.id == "p1") + #expect(SiriCatalogLabels.resolveProject("/tmp/b", in: projects)?.id == "p2") + // An ambiguous base name is rejected rather than guessed. + let duplicates = [ + SiriCatalogProject(id: "p1", name: "app", path: "/tmp/a"), + SiriCatalogProject(id: "p2", name: "app", path: "/tmp/b"), + ] + #expect(SiriCatalogLabels.resolveProject("app", in: duplicates) == nil) + } + + @Test func savedAgentLabelsSurviveDisambiguationChanges() { + let agents = [ + SiriCatalogAgent(id: "codex-acp", displayName: "Codex", available: true), + SiriCatalogAgent(id: "other-acp", displayName: "opencode", available: true), + ] + #expect(SiriCatalogLabels.resolveAgent("Codex (old-id)", in: agents)?.id == "codex-acp") + #expect(SiriCatalogLabels.resolveAgent("opencode", in: agents)?.id == "other-acp") + #expect(SiriCatalogLabels.resolveAgent("codex-acp", in: agents)?.id == "codex-acp") + } + @Test func agentOptionsProviderFiltersUnavailable() async throws { let catalog = makeCatalog(agents: [ SiriCatalogAgent(id: "codex-acp", displayName: "Codex", available: true), diff --git a/native/pipper-remote-ios/App/Intents/StartThreadIntent.swift b/native/pipper-remote-ios/App/Intents/StartThreadIntent.swift index a337687..2a85ee2 100644 --- a/native/pipper-remote-ios/App/Intents/StartThreadIntent.swift +++ b/native/pipper-remote-ios/App/Intents/StartThreadIntent.swift @@ -51,7 +51,7 @@ struct StartThreadIntent: AppIntent { func perform() async throws -> some IntentResult & ProvidesDialog & ReturnsValue { let session = await MainActor.run { RemoteSession.shared } - guard let client = await MainActor.run(body: { session.client }) else { + guard await MainActor.run(body: { session.isPaired }) else { throw StartThreadError.notPaired } // Re-validate against the freshest catalog we can get: availability may @@ -76,14 +76,14 @@ struct StartThreadIntent: AppIntent { let thread: RemoteThreadSummary do { - thread = try await client.createThread(projectId: project.id, agentId: chosenAgent.id, prompt: task) + thread = try await session.createThread(projectId: project.id, agentId: chosenAgent.id, prompt: task) } catch { throw StartThreadError.remote(error.localizedDescription) } await MainActor.run { session.lastSiriThreadId = thread.id } return .result( value: thread.id, - dialog: "Started a thread in \(project.name) with \(chosenAgent.displayName). I'll keep it running on your Mac.") + dialog: "Created a thread in \(project.name) with \(chosenAgent.displayName). Open Pipper to check progress or answer the agent.") } } diff --git a/native/pipper-remote-ios/App/Keychain.swift b/native/pipper-remote-ios/App/Keychain.swift index f690ce5..2afe12d 100644 --- a/native/pipper-remote-ios/App/Keychain.swift +++ b/native/pipper-remote-ios/App/Keychain.swift @@ -21,8 +21,7 @@ enum Keychain { return String(data: data, encoding: .utf8) } - static func write(_ account: String, value: String) { - delete(account) + static func write(_ account: String, value: String) throws { let add: [String: Any] = [ kSecClass as String: kSecClassGenericPassword, kSecAttrService as String: service, @@ -31,7 +30,16 @@ enum Keychain { // Intents may run while the phone is locked (Siri from lock screen). kSecAttrAccessible as String: kSecAttrAccessibleAfterFirstUnlock, ] - SecItemAdd(add as CFDictionary, nil) + var status = SecItemAdd(add as CFDictionary, nil) + if status == errSecDuplicateItem { + let query: [String: Any] = [kSecClass as String: kSecClassGenericPassword, + kSecAttrService as String: service, kSecAttrAccount as String: account] + status = SecItemUpdate(query as CFDictionary, [kSecValueData as String: Data(value.utf8)] as CFDictionary) + } + guard status == errSecSuccess else { + throw NSError(domain: NSOSStatusErrorDomain, code: Int(status), + userInfo: [NSLocalizedDescriptionKey: "Could not save pairing securely. Unlock your phone and try again."]) + } } static func delete(_ account: String) { diff --git a/native/pipper-remote-ios/App/RemoteSession.swift b/native/pipper-remote-ios/App/RemoteSession.swift index d0301ee..151ebcc 100644 --- a/native/pipper-remote-ios/App/RemoteSession.swift +++ b/native/pipper-remote-ios/App/RemoteSession.swift @@ -22,9 +22,40 @@ final class RemoteSession { private(set) var lastCatalogRefresh: Date? let catalogStore = CatalogStore.standard() + private let submissions = RemoteSubmissionStore() + + func createThread(projectId: String, agentId: String?, prompt: String) async throws -> RemoteThreadSummary { + guard let client, let config else { throw RemoteClientError.notPaired } + let scope = [config.host, String(config.port), "create", projectId, agentId ?? "", prompt] + let id = try submissions.requestId(for: scope) + do { + let thread = try await client.createThread(projectId: projectId, agentId: agentId, prompt: prompt, requestId: id) + try submissions.acknowledge(scope, requestId: id) + return thread + } catch RemoteClientError.rejected(let message) { + // The Mac confirmed it never dispatched this request. A deliberate + // retry after fixing setup may use a new ID; timeouts retain the old ID. + try submissions.acknowledge(scope, requestId: id) + throw RemoteClientError.rejected(message) + } + } + + func sendPrompt(threadId: String, prompt: String) async throws { + guard let client, let config else { throw RemoteClientError.notPaired } + let scope = [config.host, String(config.port), "prompt", threadId, prompt] + let id = try submissions.requestId(for: scope) + do { + try await client.sendPrompt(threadId: threadId, prompt: prompt, requestId: id) + try submissions.acknowledge(scope, requestId: id) + } catch RemoteClientError.rejected(let message) { + try submissions.acknowledge(scope, requestId: id) + throw RemoteClientError.rejected(message) + } + } private init() { let defaults = UserDefaults.standard + lastSiriThreadId = defaults.string(forKey: Keys.lastSiriThreadId) if let host = defaults.string(forKey: Keys.host), !host.isEmpty, let token = Keychain.read(Keys.token), !token.isEmpty { @@ -44,11 +75,11 @@ final class RemoteSession { /// Persist a pairing after `health()` succeeded. Token goes to the Keychain, /// host/port to defaults. - func pair(_ next: RemoteConfig) { + func pair(_ next: RemoteConfig) throws { + try Keychain.write(Keys.token, value: next.token) let defaults = UserDefaults.standard defaults.set(next.host, forKey: Keys.host) defaults.set(next.port, forKey: Keys.port) - Keychain.write(Keys.token, value: next.token) config = next } @@ -56,7 +87,7 @@ final class RemoteSession { let defaults = UserDefaults.standard defaults.removeObject(forKey: Keys.host) defaults.removeObject(forKey: Keys.port) - defaults.removeObject(forKey: Keys.lastSiriThreadId) + lastSiriThreadId = nil Keychain.delete(Keys.token) catalogStore.clear() config = nil @@ -96,7 +127,6 @@ final class RemoteSession { /// Thread most recently created by Siri; the app lands on it next open. var lastSiriThreadId: String? { - get { UserDefaults.standard.string(forKey: Keys.lastSiriThreadId) } - set { UserDefaults.standard.set(newValue, forKey: Keys.lastSiriThreadId) } + didSet { UserDefaults.standard.set(lastSiriThreadId, forKey: Keys.lastSiriThreadId) } } } diff --git a/native/pipper-remote-ios/App/Views/PairingView.swift b/native/pipper-remote-ios/App/Views/PairingView.swift index 6d5244e..e2498a6 100644 --- a/native/pipper-remote-ios/App/Views/PairingView.swift +++ b/native/pipper-remote-ios/App/Views/PairingView.swift @@ -10,6 +10,10 @@ struct PairingView: View { @State private var scanning = false @State private var testing = false @State private var error: String? + /// A pairing config offered by an incoming deep link, held until the user + /// confirms it. Custom URL schemes can be opened by any app or web page, so + /// a link must never pair silently. + @State private var pendingPairing: RemoteConfig? /// The host field tolerates `host:port` or a pasted URL; the port/token /// fields win only when the host field carried none. @@ -90,27 +94,48 @@ struct PairingView: View { } .onOpenURL { url in // pipper-remote://pair?url= — lets a future - // desktop "Send to phone" open the app directly. + // desktop "Send to phone" open the app directly. Any app or web page + // can trigger this scheme, so never pair on the link's say-so: surface + // the target and require an explicit confirmation. guard let items = URLComponents(url: url, resolvingAgainstBaseURL: false)?.queryItems, let raw = items.first(where: { $0.name == "url" })?.value, let cfg = PairingURL.parse(raw) else { return } - Task { await pair(cfg) } + pendingPairing = cfg + } + .alert( + "Pair with this Mac?", + isPresented: Binding( + get: { pendingPairing != nil }, + set: { if !$0 { pendingPairing = nil } } + ), + presenting: pendingPairing + ) { cfg in + Button("Pair") { + pendingPairing = nil + Task { await pair(cfg) } + } + Button("Cancel", role: .cancel) { pendingPairing = nil } + } message: { cfg in + Text( + "A link wants to pair Pipper with \(cfg.host):\(cfg.port). Only continue if you started this pairing." + ) } } } private func pair(_ cfg: RemoteConfig) async { + guard !testing else { return } error = nil testing = true defer { testing = false } do { - let ok = try await RemoteClient(config: cfg).health() - guard ok else { + let diagnostics = try await RemoteClient(config: cfg).diagnostics() + guard diagnostics.paired else { error = "The Mac answered, but not as Pipper." return } - session.pair(cfg) + try session.pair(cfg) await session.refreshCatalog() } catch { self.error = error.localizedDescription diff --git a/native/pipper-remote-ios/App/Views/SettingsView.swift b/native/pipper-remote-ios/App/Views/SettingsView.swift index 9316f8c..c70c19b 100644 --- a/native/pipper-remote-ios/App/Views/SettingsView.swift +++ b/native/pipper-remote-ios/App/Views/SettingsView.swift @@ -5,7 +5,6 @@ struct SettingsView: View { @Environment(RemoteSession.self) private var session @Environment(\.dismiss) private var dismiss @State private var refreshing = false - @State private var reachable: Bool? var body: some View { NavigationStack { @@ -13,14 +12,8 @@ struct SettingsView: View { Section("Mac") { LabeledContent("Host", value: session.config?.host ?? "—") LabeledContent("Port", value: session.config.map { String($0.port) } ?? "—") - Button("Test connection") { Task { await test() } } - if let reachable { - Label( - reachable ? "Reachable" : "Not reachable", - systemImage: reachable ? "checkmark.circle.fill" : "xmark.circle.fill") - .foregroundStyle(reachable ? .green : .red) - } } + ConnectionCheckView() Section { Button { Task { @@ -90,8 +83,61 @@ struct SettingsView: View { } } - private func test() async { - guard let client = session.client else { return } - reachable = (try? await client.health()) ?? false + } + +/// Shared by setup and settings; authentication is checked by diagnostics, +/// unlike the public reachability endpoint. +struct ConnectionCheckView: View { + @Environment(RemoteSession.self) private var session + @State private var diagnostics: RemoteDiagnostics? + @State private var error: String? + @State private var checking = false + @State private var checkedAt: Date? + @State private var showSample = false + + var body: some View { + Section("Connection checks") { + Button(checking ? "Checking…" : "Test connection") { Task { await check() } } + .disabled(checking) + if let error { + Text(error).font(.footnote).foregroundStyle(.red) + Text("Keep Pipper open on the Mac and connect both devices to the same Tailscale network.") + .font(.footnote).foregroundStyle(.secondary) + } + if let diagnostics { + Label("Mac reachable · pairing accepted", systemImage: "checkmark.circle") + Label(diagnostics.agentReady ? "Pipper is ready" : "Pipper is starting", + systemImage: diagnostics.agentReady ? "checkmark.circle" : "clock") + Text("\(diagnostics.availableAgents) available agents · \(diagnostics.projects) projects") + Text(diagnostics.guidance).font(.footnote).foregroundStyle(.secondary) + Button("Run a sample task") { showSample = true } + .disabled(!diagnostics.ready || error != nil || checking) + } + if let checkedAt { + Text("Last checked \(checkedAt.formatted(date: .omitted, time: .standard))") + .font(.caption).foregroundStyle(.secondary) + } + } + .task { await check() } + .sheet(isPresented: $showSample) { + NewThreadSheet(onCreated: { thread in + session.lastSiriThreadId = thread.id + showSample = false + }, sampleTask: true) + } + } + + private func check() async { + guard let client = session.client, !checking else { return } + checking = true + error = nil + defer { checking = false } + do { + diagnostics = try await client.diagnostics() + checkedAt = Date() + await session.refreshCatalog() + } catch { + self.error = error.localizedDescription + } } } diff --git a/native/pipper-remote-ios/App/Views/ThreadDetailView.swift b/native/pipper-remote-ios/App/Views/ThreadDetailView.swift index e882c73..6c722b9 100644 --- a/native/pipper-remote-ios/App/Views/ThreadDetailView.swift +++ b/native/pipper-remote-ios/App/Views/ThreadDetailView.swift @@ -4,10 +4,14 @@ import SwiftUI /// in-progress agent text, so replies arrive whole) plus a follow-up box. struct ThreadDetailView: View { @Environment(RemoteSession.self) private var session + @Environment(\.scenePhase) private var scenePhase let threadId: String @State private var report: RemoteReport? @State private var loadError: String? + @State private var lastUpdated: Date? + @State private var controlling = false + @State private var loading = false @State private var draft = "" @State private var sending = false @State private var sendError: String? @@ -25,6 +29,40 @@ struct ThreadDetailView: View { LazyVStack(alignment: .leading, spacing: 10) { if let report { StatusCard(report: report) + if let lastUpdated { + Text("Updated \(lastUpdated.formatted(date: .omitted, time: .standard))") + .font(.caption).foregroundStyle(.secondary) + } + if let loadError { + Text("Connection lost. Showing the last update. \(loadError)") + .font(.footnote).foregroundStyle(.orange) + Button("Retry connection") { Task { await load() } } + } + if let error = report.request?.error { + Text(error).font(.footnote).foregroundStyle(.red) + } + ForEach(report.permissions ?? []) { decision in + VStack(alignment: .leading, spacing: 8) { + Text(decision.title).font(.headline) + if let detail = decision.detail { + Text(detail).font(.caption.monospaced()).textSelection(.enabled) + } + ForEach(decision.options) { option in + Button(option.name) { + Task { await control(decision: decision.id, option: option.optionId) } + }.buttonStyle(.bordered).disabled(controlling || loadError != nil) + } + Button("Dismiss request", role: .destructive) { + Task { await control(decision: decision.id) } + }.disabled(controlling || loadError != nil) + } + .padding().background(.thinMaterial, in: RoundedRectangle(cornerRadius: 12)) + } + if report.running || !(report.permissions ?? []).isEmpty { + Button("Stop this thread", role: .destructive) { + Task { await control() } + }.buttonStyle(.bordered).disabled(controlling) + } ForEach(Array(report.messages.enumerated()), id: \.offset) { _, m in Bubble(role: m.role, text: m.text) } @@ -76,13 +114,16 @@ struct ThreadDetailView: View { Image(systemName: "paperplane.fill") } .buttonStyle(.borderedProminent) - .disabled(draft.trimmingCharacters(in: .whitespaces).isEmpty || sending) + .disabled(draft.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty || sending || report?.running == true) + .accessibilityLabel("Send follow-up") } .padding(12) } .navigationTitle(report?.summary ?? "Thread") .navigationBarTitleDisplayMode(.inline) - .task(id: threadId) { await poll() } + .task(id: "\(threadId)-\(scenePhase == .active)") { + if scenePhase == .active { await poll() } + } } private var pendingVisible: String? { @@ -108,10 +149,15 @@ struct ThreadDetailView: View { } private func load() async { - guard let client = session.client else { return } + guard let client = session.client, !loading else { return } + loading = true + defer { loading = false } do { let next = try await client.report(threadId: threadId) + guard !Task.isCancelled else { return } if next != report { report = next } + lastUpdated = Date() + if next.request?.state == "failed" || next.request?.state == "interrupted" { pending = nil } loadError = nil if let p = pending, next.messages.filter({ $0.role == .user && $0.text == p.text }).count > p.known { pending = nil @@ -121,8 +167,25 @@ struct ThreadDetailView: View { } } + private func control(decision: String? = nil, option: String? = nil) async { + guard let client = session.client, !controlling else { return } + controlling = true + sendError = nil + defer { controlling = false } + do { + if let decision { + try await client.answer(threadId: threadId, decisionId: decision, optionId: option, cancelled: option == nil) + } else { + try await client.stop(threadId: threadId) + } + } catch { + sendError = error.localizedDescription + } + await load() + } + private func send() async { - guard let client = session.client else { return } + guard session.isPaired, !sending else { return } let text = draft.trimmingCharacters(in: .whitespacesAndNewlines) guard !text.isEmpty else { return } sending = true @@ -133,7 +196,7 @@ struct ThreadDetailView: View { pending = (text, known) defer { sending = false } do { - try await client.sendPrompt(threadId: threadId, prompt: text) + try await session.sendPrompt(threadId: threadId, prompt: text) await load() } catch { draft = text @@ -169,7 +232,7 @@ private struct StatusCard: View { } label: { HStack(spacing: 8) { Circle().fill(report.running ? Color.green : Color.secondary.opacity(0.4)).frame(width: 8, height: 8) - Text(report.running ? "Running on Mac" : "Done") + Text(!(report.permissions ?? []).isEmpty ? "Needs your input" : report.running ? "Running on Mac" : "Not running") if let p = report.projectName { Text("· \(p)").foregroundStyle(.secondary) } diff --git a/native/pipper-remote-ios/App/Views/ThreadListView.swift b/native/pipper-remote-ios/App/Views/ThreadListView.swift index c334c2e..d769fad 100644 --- a/native/pipper-remote-ios/App/Views/ThreadListView.swift +++ b/native/pipper-remote-ios/App/Views/ThreadListView.swift @@ -15,6 +15,7 @@ struct ThreadListView: View { var body: some View { NavigationStack(path: $path) { List { + ConnectionCheckView() if let loadError { Text(loadError).foregroundStyle(.red).font(.footnote) } @@ -59,8 +60,9 @@ struct ThreadListView: View { SettingsView() } .refreshable { await load() } - .task { await poll() } + .task(id: scenePhase == .active) { if scenePhase == .active { await poll() } } .onAppear { openSiriThreadIfAny() } + .onChange(of: session.lastSiriThreadId) { _, _ in openSiriThreadIfAny() } // Siri may have run while the app sat in the background; land on the // thread it created the next time the app comes forward. .onChange(of: scenePhase) { _, phase in @@ -127,6 +129,7 @@ struct NewThreadSheet: View { @State private var projectId = "" @State private var agentId = "" @State private var prompt = "" + var sampleTask = false @State private var sending = false @State private var error: String? @@ -162,11 +165,12 @@ struct NewThreadSheet: View { } } } - .navigationTitle("New thread") + .navigationTitle(sampleTask ? "Sample task" : "New thread") .navigationBarTitleDisplayMode(.inline) + .interactiveDismissDisabled(sending) .toolbar { ToolbarItem(placement: .cancellationAction) { - Button("Cancel") { dismiss() } + Button("Cancel") { dismiss() }.disabled(sending) } ToolbarItem(placement: .confirmationAction) { Button("Start") { Task { await start() } } @@ -174,6 +178,9 @@ struct NewThreadSheet: View { } } .task { + if sampleTask && prompt.isEmpty { + prompt = "Describe this project's purpose in one sentence. Do not change files or run commands." + } await session.refreshCatalogIfStale() if projectId.isEmpty, let first = session.catalog.projects.first { projectId = first.id } } @@ -181,12 +188,12 @@ struct NewThreadSheet: View { } private func start() async { - guard let client = session.client else { return } + guard session.isPaired, !sending else { return } sending = true defer { sending = false } error = nil do { - let thread = try await client.createThread( + let thread = try await session.createThread( projectId: projectId, agentId: agentId.isEmpty ? session.catalog.preferredAgent?.id : agentId, prompt: prompt.trimmingCharacters(in: .whitespacesAndNewlines)) diff --git a/native/pipper-remote-ios/README.md b/native/pipper-remote-ios/README.md index 7cb40f7..6759353 100644 --- a/native/pipper-remote-ios/README.md +++ b/native/pipper-remote-ios/README.md @@ -93,3 +93,33 @@ Plain HTTP on purpose, exactly like the PWA: the laptop only binds loopback + Tailscale, so the bearer token only ever crosses the WireGuard tailnet. ATS is opened (`NSAllowsArbitraryLoads`) for that reason. The token lives in the Keychain with `AfterFirstUnlock` so Siri works from the lock screen. + +## Remote controls and recovery + +Update the desktop and phone app together: thread creation and follow-ups now +require a `requestId`. The phone retains an unacknowledged ID across retries and +app restarts; Pipper records it before creating a worktree or dispatching a +prompt. Follow-ups are acknowledged immediately. If Pipper restarts during an +uncertain dispatch, the existing request is shown as interrupted and is never +replayed automatically. Inspect its thread before deliberately starting new work. +A confirmed rejection before dispatch permits a new attempt after fixing setup. + +New remote and Mac Siri threads require a verified Git worktree. A worktree +failure stops creation; follow-ups also stop if their worktree has disappeared. +Existing project-root threads can be read and stopped remotely, but further work +must be started in an isolated thread. + +The thread report includes pending agent decisions. Choose the agent's offered +option, dismiss the request, or stop that thread; stale answers are rejected. +Unanswered permissions expire without approval. Stopping a thread also stops +its agent terminals and child runs without stopping another thread's terminals. + +Connection checks on the home screen and in Settings verify pairing, +Pipper availability, installed agents, and projects. The sample-task form lets +you choose a project before asking its agent for a one-sentence description. +Thread views retain the last report during disconnects and show its update time. + +Server receipts live under `userData/remote-requests/`. Do not delete this +history to retry a task: it prevents duplicate dispatch after a lost response. +ACP itself does not provide an idempotency key, so an interrupted execution +requires inspection instead of an automatic retry. diff --git a/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteClient.swift b/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteClient.swift index f7cefec..debfbb7 100644 --- a/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteClient.swift +++ b/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteClient.swift @@ -1,4 +1,5 @@ import Foundation +import CryptoKit public enum RemoteClientError: Error, LocalizedError, Equatable { case notPaired @@ -6,6 +7,7 @@ public enum RemoteClientError: Error, LocalizedError, Equatable { case unreachable(String) case http(status: Int, body: String) case decoding(String) + case rejected(String) public var errorDescription: String? { switch self { @@ -17,6 +19,7 @@ public enum RemoteClientError: Error, LocalizedError, Equatable { if status == 503 { return "The agent on your Mac isn't ready yet." } let detail = body.trimmingCharacters(in: .whitespacesAndNewlines) return detail.isEmpty ? "Mac returned HTTP \(status)." : "Mac returned HTTP \(status): \(detail)" + case .rejected(let message): return message case .decoding(let why): return "Unexpected reply from the Mac (\(why))." } } @@ -49,6 +52,23 @@ public struct RemoteClient: Sendable { return h.ok } + public func diagnostics() async throws -> RemoteDiagnostics { + try await get("/api/remote/diagnostics") + } + + public func stop(threadId: String) async throws { + struct Input: Encodable {} + struct Body: Decodable { var ok: Bool } + let _: Body = try await post("/api/remote/threads/\(encode(threadId))/stop", Input()) + } + + public func answer(threadId: String, decisionId: String, optionId: String?, cancelled: Bool = false) async throws { + struct Input: Encodable { var decisionId: String; var optionId: String?; var cancelled: Bool } + struct Body: Decodable { var ok: Bool } + let _: Body = try await post("/api/remote/threads/\(encode(threadId))/permission", + Input(decisionId: decisionId, optionId: optionId, cancelled: cancelled)) + } + public func fetchCatalog() async throws -> RemoteCatalog { try await get("/api/remote/catalog") } @@ -66,30 +86,31 @@ public struct RemoteClient: Sendable { } /// `agentId` maps to the laptop's `modelId` field (it is an agent id there). - public func createThread(projectId: String, agentId: String?, prompt: String) async throws + public func createThread(projectId: String, agentId: String?, prompt: String, requestId: String) async throws -> RemoteThreadSummary { struct Input: Encodable { + var requestId: String var projectId: String var modelId: String? var prompt: String } struct Body: Decodable { var thread: RemoteThreadSummary } let b: Body = try await post( - "/api/remote/threads", Input(projectId: projectId, modelId: agentId, prompt: prompt)) + "/api/remote/threads", Input(requestId: requestId, projectId: projectId, modelId: agentId, prompt: prompt)) return b.thread } - public func sendPrompt(threadId: String, prompt: String) async throws { - struct Input: Encodable { var prompt: String } + public func sendPrompt(threadId: String, prompt: String, requestId: String) async throws { + struct Input: Encodable { var requestId: String; var prompt: String } struct Body: Decodable { var ok: Bool } - let _: Body = try await post("/api/remote/threads/\(encode(threadId))/prompt", Input(prompt: prompt)) + let _: Body = try await post("/api/remote/threads/\(encode(threadId))/prompt", Input(requestId: requestId, prompt: prompt)) } // MARK: Transport private func encode(_ segment: String) -> String { - segment.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? segment + segment.addingPercentEncoding(withAllowedCharacters: .alphanumerics) ?? segment } private func request(_ path: String, method: String, body: Data?) throws -> URLRequest { @@ -113,6 +134,8 @@ public struct RemoteClient: Sendable { return try await perform(request(path, method: "POST", body: data)) } + private struct Rejection: Decodable { var error: String; var retryable: Bool? } + private func perform(_ req: URLRequest) async throws -> T { let data: Data let response: URLResponse @@ -125,7 +148,10 @@ public struct RemoteClient: Sendable { throw RemoteClientError.decoding("not an HTTP response") } guard (200..<300).contains(http.statusCode) else { - let text = String(data: data.prefix(300), encoding: .utf8) ?? "" + let text = String(data: data.prefix(16_384), encoding: .utf8) ?? "" + if let rejection = try? JSONDecoder().decode(Rejection.self, from: data), rejection.retryable == true { + throw RemoteClientError.rejected(rejection.error) + } throw RemoteClientError.http(status: http.statusCode, body: RemoteClient.errorMessage(from: text)) } do { @@ -144,3 +170,49 @@ public struct RemoteClient: Sendable { return body } } + + +/// Keeps the same ID after a timeout, app restart, or repeated Siri attempt. +/// Only hashes and UUIDs are stored. Clear after the Mac acknowledges acceptance. +@MainActor +public final class RemoteSubmissionStore { + private let fileURL: URL + + public init(fileURL: URL? = nil) { + self.fileURL = fileURL ?? FileManager.default.urls(for: .applicationSupportDirectory, in: .userDomainMask)[0] + .appendingPathComponent("remote-submissions.json") + } + + public func requestId(for scope: [String]) throws -> String { + var pending = try load() + let key = try key(scope) + if let id = pending[key] { return id } + let id = UUID().uuidString + pending[key] = id + try save(pending) + return id + } + + public func acknowledge(_ scope: [String], requestId: String) throws { + var pending = try load() + let key = try key(scope) + if pending[key] == requestId { + pending.removeValue(forKey: key) + try save(pending) + } + } + + private func key(_ scope: [String]) throws -> String { + SHA256.hash(data: try JSONEncoder().encode(scope)).map { String(format: "%02x", $0) }.joined() + } + + private func load() throws -> [String: String] { + guard FileManager.default.fileExists(atPath: fileURL.path) else { return [:] } + return try JSONDecoder().decode([String: String].self, from: Data(contentsOf: fileURL)) + } + + private func save(_ pending: [String: String]) throws { + try FileManager.default.createDirectory(at: fileURL.deletingLastPathComponent(), withIntermediateDirectories: true) + try JSONEncoder().encode(pending).write(to: fileURL, options: .atomic) + } +} diff --git a/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteModels.swift b/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteModels.swift index 02f4595..3da1f1b 100644 --- a/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteModels.swift +++ b/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteModels.swift @@ -143,4 +143,43 @@ public struct RemoteReport: Codable, Equatable, Sendable { public var worktreePath: String? public var isolated: Bool public var isolationNote: String? + public var permissions: [RemotePermission]? + public var request: RemoteRequestStatus? +} + +public struct RemotePermission: Codable, Equatable, Sendable, Identifiable { + public var id: String + public var title: String + public var detail: String? + public var options: [Option] + + public struct Option: Codable, Equatable, Sendable, Identifiable { + public var optionId: String + public var name: String + public var kind: String + public var id: String { optionId } + } +} + +public struct RemoteRequestStatus: Codable, Equatable, Sendable { + public var id: String + public var threadId: String? + public var state: String + public var error: String? + public var updatedAt: Double +} + +public struct RemoteDiagnostics: Codable, Equatable, Sendable { + public var paired: Bool + public var agentReady: Bool + public var availableAgents: Int + public var projects: Int + + public var ready: Bool { paired && agentReady && availableAgents > 0 && projects > 0 } + public var guidance: String { + if !agentReady { return "Open Pipper on your Mac and wait for startup to finish." } + if availableAgents == 0 { return "Install and select a coding agent in Pipper on your Mac." } + if projects == 0 { return "Add a Git project in Pipper on your Mac." } + return "Ready. Start a sample task to check the full connection." + } } diff --git a/native/pipper-remote-ios/Tests/PipperRemoteCoreTests/PipperRemoteCoreTests.swift b/native/pipper-remote-ios/Tests/PipperRemoteCoreTests/PipperRemoteCoreTests.swift index 76cd5ff..856775b 100644 --- a/native/pipper-remote-ios/Tests/PipperRemoteCoreTests/PipperRemoteCoreTests.swift +++ b/native/pipper-remote-ios/Tests/PipperRemoteCoreTests/PipperRemoteCoreTests.swift @@ -172,10 +172,11 @@ struct RemoteClientTests { ]) ) } - let thread = try await client.createThread(projectId: "p1", agentId: "codex-acp", prompt: "Fix login") + let thread = try await client.createThread(projectId: "p1", agentId: "codex-acp", prompt: "Fix login", requestId: "create-1") #expect(thread.id == "t1") #expect(thread.running) let body = try JSONSerialization.jsonObject(with: StubURLProtocol.lastBody ?? Data()) as? [String: Any] + #expect(body?["requestId"] as? String == "create-1") #expect(body?["projectId"] as? String == "p1") #expect(body?["modelId"] as? String == "codex-acp") #expect(body?["prompt"] as? String == "Fix login") @@ -226,4 +227,82 @@ struct RemoteClientTests { #expect(r.isolated == false) #expect(r.worktreePath == nil) } + @Test func followupCarriesStableRequestIdAndAcceptsImmediateAcknowledgement() async throws { + let client = stubClient { request in + #expect(request.url?.path == "/api/remote/threads/t1/prompt") + return (202, json(["ok": true])) + } + try await client.sendPrompt(threadId: "t1", prompt: "Continue", requestId: "retry-1") + let body = try JSONSerialization.jsonObject(with: StubURLProtocol.lastBody!) as! [String: Any] + #expect(body["requestId"] as? String == "retry-1") + } + + @Test func confirmedRejectionIsDistinctFromUncertainDelivery() async { + let client = stubClient { _ in (409, json(["error": "No isolated workspace", "retryable": true])) } + do { + _ = try await client.createThread(projectId: "p1", agentId: "codex", prompt: "Fix login", requestId: "r1") + Issue.record("expected rejection") + } catch let error as RemoteClientError { + #expect(error == .rejected("No isolated workspace")) + } catch { Issue.record("unexpected \(error)") } + } + + @Test func controlsTargetOnlyTheChosenThreadAndDecision() async throws { + let client = stubClient { request in + #expect(request.httpMethod == "POST") + #expect(request.value(forHTTPHeaderField: "Authorization") == "Bearer abc123") + return (200, json(["ok": true])) + } + try await client.stop(threadId: "phone-thread") + #expect(StubURLProtocol.lastRequest?.url?.path == "/api/remote/threads/phone-thread/stop") + try await client.answer(threadId: "phone-thread", decisionId: "decision-1", optionId: "reject") + #expect(StubURLProtocol.lastRequest?.url?.path == "/api/remote/threads/phone-thread/permission") + let body = try JSONSerialization.jsonObject(with: StubURLProtocol.lastBody!) as! [String: Any] + #expect(body["decisionId"] as? String == "decision-1") + #expect(body["optionId"] as? String == "reject") + #expect(body["cancelled"] as? Bool == false) + } + + @Test func diagnosticsChecksPairingAndAgentReadiness() async throws { + let client = stubClient { request in + #expect(request.url?.path == "/api/remote/diagnostics") + return (200, json(["paired": true, "agentReady": true, "availableAgents": 0, "projects": 1])) + } + let checks = try await client.diagnostics() + #expect(!checks.ready) + #expect(checks.guidance.contains("Install")) + } + + @Test func decodesPendingDecisionsAndFailedDelivery() async throws { + let client = stubClient { _ in + (200, json(["report": ["threadId": "t1", "running": false, "messages": [], "filesTouched": [], "isolated": true, + "permissions": [["id": "d1", "title": "Run tests?", "options": [["optionId": "a", "name": "Allow once", "kind": "allow_once"]]]], + "request": ["id": "r1", "threadId": "t1", "state": "failed", "error": "Agent disconnected", "updatedAt": 1]]])) + } + let report = try await client.report(threadId: "t1") + #expect(report.permissions?.first?.options.first?.optionId == "a") + #expect(report.request?.error == "Agent disconnected") + } + +} + + +@Suite("Durable submission identities") +@MainActor +struct SubmissionStoreTests { + @Test func uncertainRequestSurvivesRestartAndAcknowledgementAllowsNewTask() throws { + let directory = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString) + defer { try? FileManager.default.removeItem(at: directory) } + let file = directory.appendingPathComponent("pending.json") + let scope = ["mac", "4173", "create", "project", "agent", "private task"] + let first = try RemoteSubmissionStore(fileURL: file).requestId(for: scope) + let restored = RemoteSubmissionStore(fileURL: file) + #expect(try restored.requestId(for: scope) == first) + #expect(try restored.requestId(for: ["other Mac"] + scope) != first) + #expect(try !String(contentsOf: file, encoding: .utf8).contains("private task")) + try restored.acknowledge(scope, requestId: "stale-id") + #expect(try restored.requestId(for: scope) == first) + try restored.acknowledge(scope, requestId: first) + #expect(try restored.requestId(for: scope) != first) + } } diff --git a/src/remote/App.tsx b/src/remote/App.tsx index f15810f..e1d2aed 100644 --- a/src/remote/App.tsx +++ b/src/remote/App.tsx @@ -1,8 +1,11 @@ import { useCallback, useEffect, useRef, useState } from "react"; import { AnimatePresence, motion } from "framer-motion"; import { List, PaperPlaneTilt, Plus, QrCode } from "@phosphor-icons/react"; +import { Elevated } from "@/lib/elevated"; +import { acknowledgeSubmission, submissionId } from "./submissions.ts"; import { PhoneMarkdown } from "./markdown.tsx"; import type { + RemoteDiagnostics, RemoteModel, RemoteProject, RemoteReport, @@ -11,9 +14,18 @@ import type { const TOKEN_KEY = "omni:remote-token"; +class RemoteApiError extends Error { + readonly retryable: boolean; + constructor(message: string, retryable = false) { + super(message); + this.retryable = retryable; + } +} + async function api(path: string, init?: RequestInit): Promise { const token = localStorage.getItem(TOKEN_KEY) ?? ""; const res = await fetch(path, { + signal: AbortSignal.timeout(15_000), ...init, headers: { "Content-Type": "application/json", @@ -22,8 +34,15 @@ async function api(path: string, init?: RequestInit): Promise { }, }); if (!res.ok) { - const text = await res.text().catch(() => ""); - throw new Error(`${path} → ${res.status} ${text.slice(0, 200)}`); + const body = (await res.json().catch(() => ({}))) as { error?: string; retryable?: boolean }; + if (res.status === 401) + throw new Error( + "Pairing was rejected. Open History and pair again with the token from your Mac.", + ); + throw new RemoteApiError( + body.error ?? `Your Mac returned an error (${res.status}).`, + body.retryable === true, + ); } return (await res.json()) as T; } @@ -44,6 +63,11 @@ export function RemoteApp() { const [scanError, setScanError] = useState(null); const [sendError, setSendError] = useState(null); const [sending, setSending] = useState(false); + const sendInflight = useRef(false); + const [controlling, setControlling] = useState(false); + const [diagnostics, setDiagnostics] = useState(null); + const [lastUpdated, setLastUpdated] = useState(null); + const [lastConnected, setLastConnected] = useState(null); // Optimistic follow-up, scoped to its thread: `known` counts how many // identical user messages the report already had at send time, so a repeat // of an earlier message can't be "confirmed" by the old entry, and a fast @@ -76,17 +100,20 @@ export function RemoteApp() { if (refreshInflight.current) return; refreshInflight.current = true; try { - const [p, m, t] = await Promise.all([ + const [p, m, t, d] = await Promise.all([ api<{ projects: RemoteProject[] }>("/api/remote/projects"), api<{ models: RemoteModel[] }>("/api/remote/models"), api<{ threads: RemoteThreadSummary[] }>("/api/remote/threads"), + api("/api/remote/diagnostics"), ]); + setDiagnostics(d); + setLastConnected(Date.now()); setProjects(p.projects); setModels(m.models); setThreads(t.threads); setLoadError( p.projects.length === 0 && m.models.length === 0 - ? "Connected, but laptop returned 0 projects and 0 models. Check laptop console for [Remote] lines." + ? "Add a Git project and select an installed coding agent in Pipper on your Mac." : null, ); } catch (err) { @@ -120,6 +147,7 @@ export function RemoteApp() { const r = await api<{ report: RemoteReport }>(`/api/remote/threads/${wanted}/report`); if (!cancelled && gen === generation) { setReport(r.report); + setLastUpdated(Date.now()); setReportError(null); } } catch (err) { @@ -131,6 +159,7 @@ export function RemoteApp() { } }; setReport(null); + setLastUpdated(null); setReportError(null); void load(); const timer = setInterval(() => { @@ -189,13 +218,18 @@ export function RemoteApp() { const send = async () => { const text = draft.trim(); - if (!text || sending) return; + if (!text || sendInflight.current || report?.running) return; + sendInflight.current = true; setSending(true); setSendError(null); // Move the draft into the optimistic bubble immediately; on failure it // is restored below so nothing the user typed is ever lost. setDraft(""); + let submitted: { scope: string[]; id: string } | null = null; try { + const scope = activeId ? ["prompt", activeId, text] : ["create", projectId, modelId, text]; + const requestId = submissionId(localStorage, scope); + submitted = { scope, id: requestId }; if (!activeId) { if (!projectId || !modelId) { setDraft(text); @@ -203,7 +237,7 @@ export function RemoteApp() { } const created = await api<{ thread: RemoteThreadSummary }>("/api/remote/threads", { method: "POST", - body: JSON.stringify({ projectId, modelId, prompt: text }), + body: JSON.stringify({ requestId, projectId, modelId, prompt: text }), }); setActiveId(created.thread.id); setPending({ text, threadId: created.thread.id, known: 0 }); @@ -215,16 +249,44 @@ export function RemoteApp() { setPending({ text, threadId: activeId, known }); await api(`/api/remote/threads/${activeId}/prompt`, { method: "POST", - body: JSON.stringify({ prompt: text }), + body: JSON.stringify({ requestId, prompt: text }), }); } + acknowledgeSubmission(localStorage, scope, requestId); void refresh(); } catch (err) { + if (submitted && err instanceof RemoteApiError && err.retryable) { + acknowledgeSubmission(localStorage, submitted.scope, submitted.id); + } setDraft(text); setPending(null); setSendError(`Send failed: ${err instanceof Error ? err.message : String(err)}`); } finally { setSending(false); + sendInflight.current = false; + } + }; + + const control = async (decisionId?: string, optionId?: string) => { + if (!activeId || controlling) return; + const threadId = activeId; + setControlling(true); + setSendError(null); + try { + await api(`/api/remote/threads/${threadId}/${decisionId ? "permission" : "stop"}`, { + method: "POST", + body: JSON.stringify(decisionId ? { decisionId, optionId, cancelled: !optionId } : {}), + }); + // Poll owns report updates, so a late response cannot overwrite another thread. + void refresh(); + } catch (error) { + setSendError( + error instanceof Error + ? error.message + : "Couldn't reach your Mac. Check Tailscale and retry.", + ); + } finally { + setControlling(false); } }; @@ -275,8 +337,11 @@ export function RemoteApp() { if (!paired) { return (
    -

    Omni Remote

    -

    Paste the pairing token from the laptop terminal, or scan its QR.

    +

    Pipper Remote

    +

    + Keep Pipper open on your Mac and connect both devices to Tailscale. Paste the token from + Settings → Remote access, or scan its QR. +

    - -
    @@ -363,7 +433,52 @@ export function RemoteApp() {
    - {loadError &&

    {loadError}

    } + {loadError && ( +

    + {loadError} Keep Pipper open and check Tailscale on both devices. +

    + )} + {!activeId && ( +
    + + {lastConnected && ( +

    + Last connected {new Date(lastConnected).toLocaleTimeString()} +

    + )} + {diagnostics && ( +

    + Pairing accepted · {diagnostics.agentReady ? "Pipper ready" : "Pipper starting"} ·{" "} + {diagnostics.availableAgents} available agents · {diagnostics.projects} projects +

    + )} + {diagnostics?.availableAgents === 0 && ( +

    Install and select an agent in Pipper on your Mac.

    + )} + {diagnostics?.projects === 0 && ( +

    Add a Git project in Pipper on your Mac.

    + )} + +
    + )} {!activeId ? ( <>
    @@ -405,11 +520,18 @@ export function RemoteApp() { ) : ( <> {reportError && ( -

    Couldn't refresh — showing last update.

    +

    + {reportError} Showing the last update; check Tailscale and keep Pipper open on + your Mac. +

    )}
    - {report.running ? "Running on laptop…" : "Done"} + {report.permissions?.length + ? "Needs your input" + : report.running + ? "Running on laptop…" + : "Not running"} {report.projectName ? ` · ${report.projectName}` : ""} {report.summary &&

    {report.summary}

    } @@ -430,6 +552,44 @@ export function RemoteApp() { )}
    + {lastUpdated && ( +

    + Updated {new Date(lastUpdated).toLocaleTimeString()} +

    + )} + {report.request?.error &&

    {report.request.error}

    } + {report.permissions?.map((decision) => ( + +

    {decision.title}

    + {decision.detail && 
    {decision.detail}
    } + {decision.options.map((option) => ( + + ))} + +     + ))} + {(report.running || !!report.permissions?.length) && ( + + )} {report.messages.length === 0 && !pendingVisible && (

    Waiting for the first reply…

    )} @@ -460,7 +620,7 @@ export function RemoteApp() {
    )} {!report.running && !report.finalText && report.messages.length > 0 && ( -

    Done

    +

    Not running

    )}
    @@ -489,7 +649,7 @@ export function RemoteApp() { className="composer-send" onClick={() => void send()} aria-label="Send" - disabled={!draft.trim() || sending} + disabled={!draft.trim() || sending || report?.running === true} whileTap={{ scale: 0.9 }} transition={{ duration: 0.08 }} > diff --git a/src/remote/remote.css b/src/remote/remote.css index 5094c6a..70db3ae 100644 --- a/src/remote/remote.css +++ b/src/remote/remote.css @@ -484,3 +484,20 @@ body { background: var(--surface-3); color: var(--ink); } + +.remote-decision { + display: grid; + gap: 8px; + padding: 16px; + border: 1px solid var(--ink-faint); + border-radius: var(--radius-card); +} +.remote-decision pre { + white-space: pre-wrap; + overflow-wrap: anywhere; + font-size: 12px; +} +button:disabled { + opacity: 0.5; + cursor: default; +} diff --git a/src/remote/submissions.test.ts b/src/remote/submissions.test.ts new file mode 100644 index 0000000..b76e1bb --- /dev/null +++ b/src/remote/submissions.test.ts @@ -0,0 +1,18 @@ +import { expect, it } from "vitest"; +import { acknowledgeSubmission, submissionId } from "./submissions.ts"; + +it("reuses uncertain submissions across reloads and only clears the acknowledged request", () => { + const data = new Map(); + const storage = { + getItem: (key: string) => data.get(key) ?? null, + setItem: (key: string, value: string) => data.set(key, value), + } as unknown as Storage; + const scope = ["create", "project", "agent", "Fix login"]; + const first = submissionId(storage, scope); + expect(submissionId(storage, scope)).toBe(first); + expect(submissionId(storage, ["prompt", "thread", "Fix login"])).not.toBe(first); + acknowledgeSubmission(storage, scope, "wrong-id"); + expect(submissionId(storage, scope)).toBe(first); + acknowledgeSubmission(storage, scope, first); + expect(submissionId(storage, scope)).not.toBe(first); +}); diff --git a/src/remote/submissions.ts b/src/remote/submissions.ts new file mode 100644 index 0000000..1c62816 --- /dev/null +++ b/src/remote/submissions.ts @@ -0,0 +1,26 @@ +const KEY = "omni:remote-pending-submissions"; +type Pending = Record; + +/** Keep uncertain submissions across reloads; only an acknowledgement clears them. + * getRandomValues also works on the HTTP Tailscale origin (randomUUID does not). + */ +export function submissionId(storage: Storage, scope: string[]): string { + const pending: Pending = JSON.parse(storage.getItem(KEY) ?? "{}"); + const key = JSON.stringify(scope); + if (pending[key]) return pending[key]; + const id = Array.from(crypto.getRandomValues(new Uint8Array(16)), (b) => + b.toString(16).padStart(2, "0"), + ).join(""); + pending[key] = id; + storage.setItem(KEY, JSON.stringify(pending)); + return id; +} + +export function acknowledgeSubmission(storage: Storage, scope: string[], id: string): void { + const pending: Pending = JSON.parse(storage.getItem(KEY) ?? "{}"); + const key = JSON.stringify(scope); + if (pending[key] === id) { + delete pending[key]; + storage.setItem(KEY, JSON.stringify(pending)); + } +} From a0e5cb63ab18e4010390b813b91570b1ec0b60f7 Mon Sep 17 00:00:00 2001 From: Kalyan5252 Date: Sun, 27 Sep 2026 19:50:50 +0530 Subject: [PATCH 19/22] IOS Connection & Thread issue fix --- electron/agents/registry.ts | 10 +++ .../App/Views/SettingsView.swift | 17 +++-- .../App/Views/ThreadDetailView.swift | 21 +++++- .../PipperRemote.xcodeproj/project.pbxproj | 71 +++++++++---------- .../contents.xcworkspacedata | 7 ++ .../PipperRemoteCore/RemoteClient.swift | 7 +- 6 files changed, 88 insertions(+), 45 deletions(-) create mode 100644 native/pipper-remote-ios/PipperRemote.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/electron/agents/registry.ts b/electron/agents/registry.ts index ca02f9d..8573582 100644 --- a/electron/agents/registry.ts +++ b/electron/agents/registry.ts @@ -448,6 +448,16 @@ export function resolveAgentSpawn(agent: AcpAgentDescriptor): { env: Record; } { const env = { ...process.env, ...agent.env } as Record; + // `bun run --bun` prepends a temp dir whose `node` symlinks to bun. npx-based + // agents are `#!/usr/bin/env node` scripts; run under bun, npm derives its + // global prefix from the bun binary (~/.bun) and fails with ENOENT on + // ~/.bun/lib. Strip the shim so agents run under real node. + const pathKey = process.platform === "win32" ? "Path" : "PATH"; + const sep = process.platform === "win32" ? ";" : ":"; + env[pathKey] = (env[pathKey] ?? env.PATH ?? "") + .split(sep) + .filter((dir) => !/[\\/]bun-node-[^\\/]+$/.test(dir)) + .join(sep); if (agent.id === "pipper-mock" || agent.installKind === "mock") { const mockPath = join(registryDir, "mock-agent.mjs"); diff --git a/native/pipper-remote-ios/App/Views/SettingsView.swift b/native/pipper-remote-ios/App/Views/SettingsView.swift index c70c19b..fc5aaf6 100644 --- a/native/pipper-remote-ios/App/Views/SettingsView.swift +++ b/native/pipper-remote-ios/App/Views/SettingsView.swift @@ -97,8 +97,18 @@ struct ConnectionCheckView: View { var body: some View { Section("Connection checks") { + // Modifiers on a Section inside a List/Form are applied to every row, + // which would register one sheet (and one task) per row. Anchor them to + // this always-present row instead. Button(checking ? "Checking…" : "Test connection") { Task { await check() } } .disabled(checking) + .task { await check() } + .sheet(isPresented: $showSample) { + NewThreadSheet(onCreated: { thread in + session.lastSiriThreadId = thread.id + showSample = false + }, sampleTask: true) + } if let error { Text(error).font(.footnote).foregroundStyle(.red) Text("Keep Pipper open on the Mac and connect both devices to the same Tailscale network.") @@ -118,13 +128,6 @@ struct ConnectionCheckView: View { .font(.caption).foregroundStyle(.secondary) } } - .task { await check() } - .sheet(isPresented: $showSample) { - NewThreadSheet(onCreated: { thread in - session.lastSiriThreadId = thread.id - showSample = false - }, sampleTask: true) - } } private func check() async { diff --git a/native/pipper-remote-ios/App/Views/ThreadDetailView.swift b/native/pipper-remote-ios/App/Views/ThreadDetailView.swift index 6c722b9..cdfcfa9 100644 --- a/native/pipper-remote-ios/App/Views/ThreadDetailView.swift +++ b/native/pipper-remote-ios/App/Views/ThreadDetailView.swift @@ -21,8 +21,25 @@ struct ThreadDetailView: View { /// or right after they send. Never yank someone who scrolled up to read. @State private var nearBottom = true @State private var forceScroll = false + /// The Mac answered 404: the thread (or its worktree) was deleted there. + /// Terminal — stop polling and don't offer a follow-up that can't land. + @State private var missing = false var body: some View { + if missing { + ContentUnavailableView { + Label("Thread no longer exists", systemImage: "trash") + } description: { + Text("It was deleted on your Mac, or its worktree was removed. Start a new thread from the list.") + } + .navigationTitle("Thread") + .navigationBarTitleDisplayMode(.inline) + } else { + content + } + } + + private var content: some View { VStack(spacing: 0) { ScrollViewReader { proxy in ScrollView { @@ -142,7 +159,7 @@ struct ThreadDetailView: View { } private func poll() async { - while !Task.isCancelled { + while !Task.isCancelled && !missing { await load() try? await Task.sleep(for: .seconds(3)) } @@ -162,6 +179,8 @@ struct ThreadDetailView: View { if let p = pending, next.messages.filter({ $0.role == .user && $0.text == p.text }).count > p.known { pending = nil } + } catch RemoteClientError.http(status: 404, _) { + missing = true } catch { loadError = error.localizedDescription } diff --git a/native/pipper-remote-ios/PipperRemote.xcodeproj/project.pbxproj b/native/pipper-remote-ios/PipperRemote.xcodeproj/project.pbxproj index 1c4cd12..caf2cf5 100644 --- a/native/pipper-remote-ios/PipperRemote.xcodeproj/project.pbxproj +++ b/native/pipper-remote-ios/PipperRemote.xcodeproj/project.pbxproj @@ -55,25 +55,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - B20400000000000000000010 = { - isa = PBXGroup; - children = ( - B20400000000000000000002 /* App */, - B20400000000000000000003 /* Intents */, - B20400000000000000000004 /* Views */, - B20400000000000000000001 /* Core */, - B20400000000000000000011 /* Products */, - ); - sourceTree = ""; - }; - B20400000000000000000011 /* Products */ = { - isa = PBXGroup; - children = ( - B20200000000000000000101 /* PipperRemote.app */, - ); - name = Products; - sourceTree = ""; - }; B20400000000000000000001 /* Core */ = { isa = PBXGroup; children = ( @@ -118,6 +99,25 @@ name = Views; sourceTree = ""; }; + B20400000000000000000010 = { + isa = PBXGroup; + children = ( + B20400000000000000000002 /* App */, + B20400000000000000000003 /* Intents */, + B20400000000000000000004 /* Views */, + B20400000000000000000001 /* Core */, + B20400000000000000000011 /* Products */, + ); + sourceTree = ""; + }; + B20400000000000000000011 /* Products */ = { + isa = PBXGroup; + children = ( + B20200000000000000000101 /* PipperRemote.app */, + ); + name = Products; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -162,6 +162,7 @@ Base, ); mainGroup = B20400000000000000000010; + preferredProjectObjectVersion = 77; productRefGroup = B20400000000000000000011 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -238,25 +239,25 @@ CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_NO_COMMON_BLOCKS = YES; - IPHONEOS_DEPLOYMENT_TARGET = 18.0; - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MTL_FAST_MATH = YES; - SDKROOT = iphoneos; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_TESTABILITY = YES; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", ); + IPHONEOS_DEPLOYMENT_TARGET = 18.0; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; @@ -267,6 +268,8 @@ CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_USER_SCRIPT_SANDBOXING = YES; GCC_NO_COMMON_BLOCKS = YES; @@ -274,11 +277,9 @@ LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MTL_FAST_MATH = YES; SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - SWIFT_COMPILATION_MODE = wholemodule; VALIDATE_PRODUCT = YES; }; name = Release; @@ -290,7 +291,7 @@ "CODE_SIGNING_ALLOWED[sdk=iphonesimulator*]" = NO; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = YSB9XBNUFD; ENABLE_PREVIEWS = YES; ENABLE_USER_SCRIPT_SANDBOXING = NO; GENERATE_INFOPLIST_FILE = NO; @@ -300,11 +301,10 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 0.0.23; - PRODUCT_BUNDLE_IDENTIFIER = com.maker-or.omni.remote; + PRODUCT_BUNDLE_IDENTIFIER = "com.maker-or.omni.remote"; PRODUCT_NAME = PipperRemote; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SWIFT_EMIT_LOC_STRINGS = YES; - }; name = Debug; }; @@ -315,7 +315,7 @@ "CODE_SIGNING_ALLOWED[sdk=iphonesimulator*]" = NO; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = ""; + DEVELOPMENT_TEAM = YSB9XBNUFD; ENABLE_PREVIEWS = YES; ENABLE_USER_SCRIPT_SANDBOXING = NO; GENERATE_INFOPLIST_FILE = NO; @@ -325,11 +325,10 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 0.0.23; - PRODUCT_BUNDLE_IDENTIFIER = com.maker-or.omni.remote; + PRODUCT_BUNDLE_IDENTIFIER = "com.maker-or.omni.remote"; PRODUCT_NAME = PipperRemote; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SWIFT_EMIT_LOC_STRINGS = YES; - }; name = Release; }; diff --git a/native/pipper-remote-ios/PipperRemote.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/native/pipper-remote-ios/PipperRemote.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/native/pipper-remote-ios/PipperRemote.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteClient.swift b/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteClient.swift index debfbb7..d983f3d 100644 --- a/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteClient.swift +++ b/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteClient.swift @@ -109,8 +109,13 @@ public struct RemoteClient: Sendable { // MARK: Transport + /// RFC 3986 unreserved characters pass through untouched. The Mac matches + /// the raw `url.pathname` without decoding, so escaping the `-` in a UUID + /// (as `.alphanumerics` alone would, to `%2D`) makes every thread 404. + private static let pathSegmentAllowed = CharacterSet.alphanumerics.union(CharacterSet(charactersIn: "-._~")) + private func encode(_ segment: String) -> String { - segment.addingPercentEncoding(withAllowedCharacters: .alphanumerics) ?? segment + segment.addingPercentEncoding(withAllowedCharacters: Self.pathSegmentAllowed) ?? segment } private func request(_ path: String, method: String, body: Data?) throws -> URLRequest { From e528ff5cb030e8b23d3c55a75ea99f57475e7fd9 Mon Sep 17 00:00:00 2001 From: Harshith Pasupuleti Date: Thu, 1 Oct 2026 20:42:44 +0530 Subject: [PATCH 20/22] Fix iOS keychain entitlement errors and simulator launch tooling Surface errSecMissingEntitlement when the keychain rejects a pairing save instead of the misleading "unlock your phone" hint, and add DEBUG-only SwiftUI previews for the root/paired/unpaired states. run-simulator.sh now opens Device Hub (Xcode 27) or Simulator, whichever exists, and sign-simulator.sh regenerates the application-identifier and keychain-access-groups entitlements before signing so the simulator build can write to the keychain. --- native/pipper-remote-ios/App/Keychain.swift | 15 ++- .../App/PipperRemoteApp.swift | 12 ++ .../pipper-remote-ios/App/RemoteSession.swift | 106 ++++++++++++++++++ .../App/Views/PairingView.swift | 7 ++ .../App/Views/QRScannerSheet.swift | 23 ++++ .../App/Views/SettingsView.swift | 14 +++ .../App/Views/ThreadDetailView.swift | 36 ++++++ .../App/Views/ThreadListView.swift | 25 +++++ .../scripts/run-simulator.sh | 13 ++- .../scripts/sign-simulator.sh | 41 ++++++- 10 files changed, 288 insertions(+), 4 deletions(-) diff --git a/native/pipper-remote-ios/App/Keychain.swift b/native/pipper-remote-ios/App/Keychain.swift index 2afe12d..eef1013 100644 --- a/native/pipper-remote-ios/App/Keychain.swift +++ b/native/pipper-remote-ios/App/Keychain.swift @@ -38,7 +38,20 @@ enum Keychain { } guard status == errSecSuccess else { throw NSError(domain: NSOSStatusErrorDomain, code: Int(status), - userInfo: [NSLocalizedDescriptionKey: "Could not save pairing securely. Unlock your phone and try again."]) + userInfo: [NSLocalizedDescriptionKey: "Could not save pairing securely. \(Self.hint(for: status))"]) + } + } + + /// A signed-but-unentitled app fails with `errSecMissingEntitlement`, which + /// "unlock your phone" misleadingly hid; name the real cause when we know it. + private static func hint(for status: OSStatus) -> String { + switch status { + case errSecInteractionNotAllowed: + return "Unlock your phone and try again." + case errSecMissingEntitlement: + return "The app is missing its keychain entitlement — reinstall the signed build." + default: + return "Keychain error \(status)." } } diff --git a/native/pipper-remote-ios/App/PipperRemoteApp.swift b/native/pipper-remote-ios/App/PipperRemoteApp.swift index 8a2d28a..fac3585 100644 --- a/native/pipper-remote-ios/App/PipperRemoteApp.swift +++ b/native/pipper-remote-ios/App/PipperRemoteApp.swift @@ -35,3 +35,15 @@ struct RootView: View { } } } + +#if DEBUG +#Preview("Root — unpaired") { + RootView() + .environment(RemoteSession.preview()) +} + +#Preview("Root — paired") { + RootView() + .environment(RemoteSession.preview(catalog: PreviewData.catalog, paired: true)) +} +#endif diff --git a/native/pipper-remote-ios/App/RemoteSession.swift b/native/pipper-remote-ios/App/RemoteSession.swift index 151ebcc..70eada1 100644 --- a/native/pipper-remote-ios/App/RemoteSession.swift +++ b/native/pipper-remote-ios/App/RemoteSession.swift @@ -23,6 +23,9 @@ final class RemoteSession { let catalogStore = CatalogStore.standard() private let submissions = RemoteSubmissionStore() + #if DEBUG + private var isPreview = false + #endif func createThread(projectId: String, agentId: String?, prompt: String) async throws -> RemoteThreadSummary { guard let client, let config else { throw RemoteClientError.notPaired } @@ -66,9 +69,31 @@ final class RemoteSession { lastCatalogRefresh = catalogStore.modifiedAt } + #if DEBUG + /// Preview-only initializer: seeds a catalog without touching the Keychain, + /// UserDefaults, or the shared on-disk cache. The paired state uses a dummy + /// config, while `client` remains nil so previews never make network requests. + init(previewCatalog: RemoteCatalog, paired: Bool = false) { + config = paired ? RemoteConfig(host: "preview.invalid", port: RemoteConfig.defaultPort, token: "preview") : nil + catalog = previewCatalog + catalogError = nil + lastCatalogRefresh = nil + lastSiriThreadId = nil + isPreview = true + } + + /// A detached session for SwiftUI previews. + static func preview(catalog: RemoteCatalog = .empty, paired: Bool = false) -> RemoteSession { + RemoteSession(previewCatalog: catalog, paired: paired) + } + #endif + var isPaired: Bool { config?.isComplete == true } var client: RemoteClient? { + #if DEBUG + if isPreview { return nil } + #endif guard let config, config.isComplete else { return nil } return RemoteClient(config: config) } @@ -130,3 +155,84 @@ final class RemoteSession { didSet { UserDefaults.standard.set(lastSiriThreadId, forKey: Keys.lastSiriThreadId) } } } + +#if DEBUG +/// Sample data for SwiftUI previews. DEBUG-only and never persisted. +enum PreviewData { + static let catalog = RemoteCatalog( + updatedAt: "2026-09-27T00:00:00Z", + defaultAgentId: "codex", + projects: [ + RemoteCatalogProject(id: "folklore", name: "FolkLore", path: "~/code/folklore"), + RemoteCatalogProject(id: "omni", name: "Omni", path: "~/code/omni"), + ], + agents: [ + RemoteCatalogAgent(id: "codex", displayName: "Codex", available: true), + RemoteCatalogAgent(id: "claude", displayName: "Claude Code", available: true), + RemoteCatalogAgent(id: "cursor", displayName: "Cursor", available: false), + ]) + + static let threads: [RemoteThreadSummary] = [ + RemoteThreadSummary( + id: "a1b2c3d4-0000-0000-0000-000000000001", projectId: "folklore", + worktreePath: "~/code/folklore/.worktrees/a1b2c3d4", title: "Add dark mode toggle", + running: true, lastUsedAt: 0), + RemoteThreadSummary( + id: "e5f6a7b8-0000-0000-0000-000000000002", projectId: "omni", + worktreePath: nil, title: "Summarize the launch plan", running: false, lastUsedAt: 0), + RemoteThreadSummary( + id: "c9d0e1f2-0000-0000-0000-000000000003", projectId: "folklore", + worktreePath: "~/code/folklore/.worktrees/c9d0e1f2", title: nil, running: false, + lastUsedAt: 0), + ] + + static let report = RemoteReport( + threadId: threads[0].id, + running: true, + summary: "Add dark mode toggle", + finalText: nil, + messages: [ + RemoteMessage(role: .user, text: "Add a dark mode toggle to Settings and remember the choice."), + RemoteMessage( + role: .agent, + text: + "Done. I added a **Dark mode** toggle to `SettingsView`, bound to `@AppStorage(\"darkMode\")`.\n\n- Toggle in Settings\n- Applies `preferredColorScheme` at the root" + ), + RemoteMessage(role: .user, text: "Nice — does it survive relaunch?"), + RemoteMessage(role: .agent, text: "Yes, `@AppStorage` persists it across launches."), + ], + projectName: "FolkLore", + filesTouched: ["App/Views/SettingsView.swift", "App/PipperRemoteApp.swift"], + worktreePath: "~/code/folklore/.worktrees/a1b2c3d4", + isolated: true, + isolationNote: nil, + permissions: nil, + request: nil) + + static let reportNeedsInput = RemoteReport( + threadId: threads[2].id, + running: false, + summary: "Refactor the settings screen", + finalText: nil, + messages: [ + RemoteMessage(role: .user, text: "Refactor SettingsView and delete the old file."), + RemoteMessage(role: .agent, text: "I can delete `OldSettingsView.swift`. Confirm before I proceed."), + ], + projectName: "FolkLore", + filesTouched: ["App/Views/SettingsView.swift"], + worktreePath: "~/code/folklore/.worktrees/c9d0e1f2", + isolated: false, + isolationNote: "No Git worktree was available.", + permissions: [ + RemotePermission( + id: "perm-1", + title: "Delete file?", + detail: "rm App/Views/OldSettingsView.swift", + options: [ + RemotePermission.Option(optionId: "allow", name: "Allow", kind: "allow"), + RemotePermission.Option(optionId: "deny", name: "Deny", kind: "deny"), + ]) + ], + request: nil) +} +#endif diff --git a/native/pipper-remote-ios/App/Views/PairingView.swift b/native/pipper-remote-ios/App/Views/PairingView.swift index e2498a6..47c9bee 100644 --- a/native/pipper-remote-ios/App/Views/PairingView.swift +++ b/native/pipper-remote-ios/App/Views/PairingView.swift @@ -142,3 +142,10 @@ struct PairingView: View { } } } + +#if DEBUG +#Preview("Pairing") { + PairingView() + .environment(RemoteSession.preview()) +} +#endif diff --git a/native/pipper-remote-ios/App/Views/QRScannerSheet.swift b/native/pipper-remote-ios/App/Views/QRScannerSheet.swift index 2e52cf5..b1f99a7 100644 --- a/native/pipper-remote-ios/App/Views/QRScannerSheet.swift +++ b/native/pipper-remote-ios/App/Views/QRScannerSheet.swift @@ -7,6 +7,14 @@ struct QRScannerSheet: View { let onCode: (String) -> Void @Environment(\.dismiss) private var dismiss @State private var denied = false + #if DEBUG + private var previewCamera = false + + init(onCode: @escaping (String) -> Void, previewCamera: Bool = false) { + self.onCode = onCode + self.previewCamera = previewCamera + } + #endif var body: some View { NavigationStack { @@ -17,8 +25,17 @@ struct QRScannerSheet: View { systemImage: "camera.fill", description: Text("Allow camera access in Settings, or enter the token manually.")) } else { + #if DEBUG + if previewCamera { + Color.black.ignoresSafeArea() + } else { + QRScannerView(onCode: onCode, onDenied: { denied = true }) + .ignoresSafeArea() + } + #else QRScannerView(onCode: onCode, onDenied: { denied = true }) .ignoresSafeArea() + #endif RoundedRectangle(cornerRadius: 16) .strokeBorder(.white.opacity(0.8), lineWidth: 2) .frame(width: 240, height: 240) @@ -112,3 +129,9 @@ final class ScannerController: UIViewController, AVCaptureMetadataOutputObjectsD onCode?(text) } } + +#if DEBUG +#Preview("Scan QR") { + QRScannerSheet(onCode: { _ in }, previewCamera: true) +} +#endif diff --git a/native/pipper-remote-ios/App/Views/SettingsView.swift b/native/pipper-remote-ios/App/Views/SettingsView.swift index fc5aaf6..3ea1cd3 100644 --- a/native/pipper-remote-ios/App/Views/SettingsView.swift +++ b/native/pipper-remote-ios/App/Views/SettingsView.swift @@ -144,3 +144,17 @@ struct ConnectionCheckView: View { } } } + +#if DEBUG +#Preview("Settings") { + SettingsView() + .environment(RemoteSession.preview(catalog: PreviewData.catalog)) +} + +#Preview("Connection check") { + Form { + ConnectionCheckView() + } + .environment(RemoteSession.preview(catalog: PreviewData.catalog)) +} +#endif diff --git a/native/pipper-remote-ios/App/Views/ThreadDetailView.swift b/native/pipper-remote-ios/App/Views/ThreadDetailView.swift index cdfcfa9..800b940 100644 --- a/native/pipper-remote-ios/App/Views/ThreadDetailView.swift +++ b/native/pipper-remote-ios/App/Views/ThreadDetailView.swift @@ -7,6 +7,18 @@ struct ThreadDetailView: View { @Environment(\.scenePhase) private var scenePhase let threadId: String + #if DEBUG + /// Preview-only seed; `previewReport` defaults to nil so the production + /// call site (`ThreadDetailView(threadId:)`) is unchanged. + init(threadId: String, previewReport: RemoteReport? = nil) { + self.threadId = threadId + if let previewReport { + _report = State(initialValue: previewReport) + _lastUpdated = State(initialValue: Date()) + } + } + #endif + @State private var report: RemoteReport? @State private var loadError: String? @State private var lastUpdated: Date? @@ -312,3 +324,27 @@ extension Text { } } } + +#if DEBUG +#Preview("Thread — running") { + NavigationStack { + ThreadDetailView(threadId: PreviewData.report.threadId, previewReport: PreviewData.report) + } + .environment(RemoteSession.preview(catalog: PreviewData.catalog)) +} + +#Preview("Thread — needs input") { + NavigationStack { + ThreadDetailView( + threadId: PreviewData.reportNeedsInput.threadId, previewReport: PreviewData.reportNeedsInput) + } + .environment(RemoteSession.preview(catalog: PreviewData.catalog)) +} + +#Preview("Thread — loading") { + NavigationStack { + ThreadDetailView(threadId: "00000000-0000-0000-0000-000000000000") + } + .environment(RemoteSession.preview(catalog: PreviewData.catalog)) +} +#endif diff --git a/native/pipper-remote-ios/App/Views/ThreadListView.swift b/native/pipper-remote-ios/App/Views/ThreadListView.swift index d769fad..d8b11c2 100644 --- a/native/pipper-remote-ios/App/Views/ThreadListView.swift +++ b/native/pipper-remote-ios/App/Views/ThreadListView.swift @@ -12,6 +12,14 @@ struct ThreadListView: View { @State private var showSettings = false @State private var path: [String] = [] + #if DEBUG + /// Preview-only seed so the list is shown populated; the default `[]` + /// keeps the production call site (`ThreadListView()`) unchanged. + init(previewThreads: [RemoteThreadSummary] = []) { + _threads = State(initialValue: previewThreads) + } + #endif + var body: some View { NavigationStack(path: $path) { List { @@ -203,3 +211,20 @@ struct NewThreadSheet: View { } } } + +#if DEBUG +#Preview("Threads") { + ThreadListView(previewThreads: PreviewData.threads) + .environment(RemoteSession.preview(catalog: PreviewData.catalog)) +} + +#Preview("Threads — empty") { + ThreadListView() + .environment(RemoteSession.preview(catalog: PreviewData.catalog)) +} + +#Preview("New thread") { + NewThreadSheet { _ in } + .environment(RemoteSession.preview(catalog: PreviewData.catalog)) +} +#endif diff --git a/native/pipper-remote-ios/scripts/run-simulator.sh b/native/pipper-remote-ios/scripts/run-simulator.sh index 0360000..3af7f94 100755 --- a/native/pipper-remote-ios/scripts/run-simulator.sh +++ b/native/pipper-remote-ios/scripts/run-simulator.sh @@ -17,7 +17,18 @@ for devs in json.load(sys.stdin)['devices'].values(): sys.exit(1)" "$DEVICE") || { echo "No available simulator named '$DEVICE'"; exit 1; } xcrun simctl bootstatus "$UDID" -b >/dev/null -open -a Simulator + +# Xcode 27 replaced Simulator.app with Device Hub; open whichever exists. +DEVTOOLS="$(xcode-select -p)" +for app in \ + "$DEVTOOLS/../Applications/DeviceHub.app" \ + "$DEVTOOLS/Applications/Simulator.app" \ + /Applications/Simulator.app; do + if [ -d "$app" ]; then + open "$app" + break + fi +done xcodebuild -project PipperRemote.xcodeproj -target PipperRemote -configuration Debug \ -sdk iphonesimulator -arch arm64 CONFIGURATION_BUILD_DIR="$OUT" build \ diff --git a/native/pipper-remote-ios/scripts/sign-simulator.sh b/native/pipper-remote-ios/scripts/sign-simulator.sh index 90a0ee8..039d084 100755 --- a/native/pipper-remote-ios/scripts/sign-simulator.sh +++ b/native/pipper-remote-ios/scripts/sign-simulator.sh @@ -7,6 +7,11 @@ # development identity instead so linkd sees a Team ID. Device builds are # untouched: they are always team-signed. # +# Re-signing by hand also drops the entitlements Xcode would have generated, +# and the Keychain refuses every write without an application-identifier / +# keychain-access-groups (SecItemAdd returns errSecMissingEntitlement, -34018). +# Regenerate those before signing. +# # Xcode may still write Metadata.appintents after this phase (its ordering # against the SSU/NLU step is not declarable), which leaves the resource seal # stale. The simulator does not enforce seals, so Xcode's Run button works; @@ -16,12 +21,44 @@ set -e if [ "$PLATFORM_NAME" != "iphonesimulator" ]; then exit 0 fi + +BUNDLE_ID=$(/usr/libexec/PlistBuddy -c "Print :CFBundleIdentifier" \ + "$CODESIGNING_FOLDER_PATH/Info.plist" 2>/dev/null || echo "com.maker-or.omni.remote") + +# Team prefix comes from the signing certificate so the keychain access group +# is valid; an ad-hoc build (no identity) falls back to a bare bundle id. +TEAM=$(security find-certificate -c "Apple Development" -p 2>/dev/null \ + | openssl x509 -noout -subject 2>/dev/null \ + | tr ',' '\n' | sed -n 's/^ *OU=//p' | head -1) +GROUP="${TEAM:+$TEAM.}$BUNDLE_ID" + +ENTITLEMENTS=$(mktemp) +trap 'rm -f "$ENTITLEMENTS"' EXIT +cat > "$ENTITLEMENTS" < + + + + application-identifier + $GROUP + keychain-access-groups + + $GROUP + + com.apple.developer.team-identifier + $TEAM + get-task-allow + + + +PLIST + IDENTITY=$(security find-identity -v -p codesigning 2>/dev/null \ | grep -o '"Apple Development[^"]*"' | head -1 | tr -d '"') if [ -z "$IDENTITY" ]; then echo "warning: no 'Apple Development' identity in the keychain; App Intents entity parameters will fail on the simulator. Sign in to Xcode > Settings > Accounts once to create one." - codesign --force --deep --sign - --timestamp=none "$CODESIGNING_FOLDER_PATH" + codesign --force --deep --sign - --timestamp=none --entitlements "$ENTITLEMENTS" "$CODESIGNING_FOLDER_PATH" exit 0 fi echo "Signing simulator build with: $IDENTITY" -codesign --force --deep --sign "$IDENTITY" --timestamp=none "$CODESIGNING_FOLDER_PATH" +codesign --force --deep --sign "$IDENTITY" --timestamp=none --entitlements "$ENTITLEMENTS" "$CODESIGNING_FOLDER_PATH" From 92129490cac8203d19445f95db5b9f0cdda86473 Mon Sep 17 00:00:00 2001 From: Harshith Pasupuleti Date: Tue, 6 Oct 2026 16:06:48 +0530 Subject: [PATCH 21/22] Support agent models selection in remote server and iOS app --- contracts/remote.ts | 19 +- electron/agent-connection-manager.ts | 40 ++- electron/isolated-agent-task.ts | 4 +- electron/remote-server.test.ts | 69 +++++ electron/remote-server.ts | 81 ++++- native/pipper-remote-ios/App/Keychain.swift | 1 + .../App/PipperRemoteApp.swift | 68 ++++- .../pipper-remote-ios/App/RemoteSession.swift | 92 +++++- .../App/Simulator.entitlements | 19 ++ .../App/Views/SettingsView.swift | 28 +- .../App/Views/ThreadDetailView.swift | 234 ++++++++------- .../App/Views/ThreadListView.swift | 280 ++++++++++++++---- .../PipperRemote.xcodeproj/project.pbxproj | 28 ++ .../PipperRemoteCore/RemoteClient.swift | 31 +- .../PipperRemoteCore/RemoteModels.swift | 29 ++ .../PipperRemoteCoreTests.swift | 31 ++ .../scripts/sign-simulator.sh | 46 +-- 17 files changed, 863 insertions(+), 237 deletions(-) create mode 100644 native/pipper-remote-ios/App/Simulator.entitlements diff --git a/contracts/remote.ts b/contracts/remote.ts index 53d8177..a90f1ad 100644 --- a/contracts/remote.ts +++ b/contracts/remote.ts @@ -15,6 +15,18 @@ export interface RemoteModel { provider?: string; } +/** A model offered inside one agent (the ACP session's model option). */ +export interface RemoteAgentModel { + id: string; + name: string; +} + +/** The thread's current model and what it can switch to. */ +export interface RemoteThreadModel { + current: string | null; + options: RemoteAgentModel[]; +} + export interface RemoteThreadSummary { id: string; projectId: string; @@ -40,6 +52,8 @@ export interface RemoteReport { isolationNote: string | null; permissions: RemotePermission[]; request: RemoteRequestStatus | null; + /** Null when the thread isn't loaded on the Mac or its agent has no model choice. */ + model: RemoteThreadModel | null; } export interface RemotePermission { @@ -67,8 +81,11 @@ export interface RemoteDiagnostics { export interface RemoteCreateThreadInput { requestId: string; projectId: string; - /** Agent/model id from the desktop registry; null = desktop default. */ + /** Agent instance id from the desktop registry (named `modelId` for + * compatibility with shipped clients); null = desktop default. */ modelId?: string | null; + /** Model inside that agent, from `/api/remote/agent-models`; null = agent default. */ + model?: string | null; prompt: string; } diff --git a/electron/agent-connection-manager.ts b/electron/agent-connection-manager.ts index d3d20d8..1c0d59c 100644 --- a/electron/agent-connection-manager.ts +++ b/electron/agent-connection-manager.ts @@ -935,6 +935,29 @@ export class AgentConnectionManager { * Returns accumulated agent_text + user_text so the phone can show the * entire final message at once when the turn ends. Falls back to the * persisted snapshot when the thread is not resident in memory. */ + /** The thread's model selector, for the phone. Null when the thread is not + * loaded in memory or its agent exposes no model choice. */ + getThreadModel(threadId: string): { + configId: string; + current: string | null; + options: Array<{ id: string; name: string }>; + } | null { + const runtime = this.sessions.get(threadId); + if (!runtime) return null; + const option = runtime.slice.configOptions.find( + (o) => o.category === "model" || o.id === "model", + ); + if (!option) return null; + const options = modelOptionsFromConfig([option]).map((m) => ({ id: m.modelId, name: m.name })); + if (!options.length) return null; + const current = (option as { currentValue?: unknown }).currentValue; + return { + configId: option.id, + current: typeof current === "string" ? current : null, + options, + }; + } + getThreadTranscript(threadId: string): { finalText: string | null; messages: Array<{ role: "user" | "agent"; text: string }>; @@ -2504,14 +2527,13 @@ export class AgentConnectionManager { // Seed model after the session exists so the first prompt lands on the // user's chosen model. Best-effort: a failed seed still leaves a usable thread. - // Skipped for background threads: setConfigOption targets the active - // thread, so seeding here would hit the desktop's thread, not this one. - if (initialModelId && !opts?.background) { + // Thread-scoped, so a background (phone) seed never hits the desktop's thread. + if (initialModelId) { try { const modelOpt = created.configOptions.find( (option) => option.id === "model" || option.category === "model", ); - await this.setConfigOption(modelOpt?.id ?? "model", initialModelId); + await this.setThreadConfigOption(thread.id, modelOpt?.id ?? "model", initialModelId); } catch (err) { console.warn("[createThread] initial model seed failed:", err); } @@ -2880,6 +2902,16 @@ export class AgentConnectionManager { async setConfigOption(configId: string, value: string | boolean): Promise { const threadId = this.activeThreadId; if (!threadId) return []; + return this.setThreadConfigOption(threadId, configId, value); + } + + /** Thread-scoped config change, so background (phone) threads can switch + * models without touching whatever the desktop has open. */ + async setThreadConfigOption( + threadId: string, + configId: string, + value: string | boolean, + ): Promise { const runtime = this.sessions.get(threadId); const owner = runtime ? this.connectionForAgent(runtime.agentId) : null; if (!runtime || !owner) return []; diff --git a/electron/isolated-agent-task.ts b/electron/isolated-agent-task.ts index 96a96ec..8b932e3 100644 --- a/electron/isolated-agent-task.ts +++ b/electron/isolated-agent-task.ts @@ -12,6 +12,8 @@ export async function prepareIsolatedAgentTask( projectId: string, requestedAgentId: string | null | undefined, prompt: string, + /** Model inside the agent (ACP model option); null keeps the agent default. */ + model: string | null = null, ) { const project = getProject(projectId); if (!project) throw new Error("Project not found. Refresh your project list."); @@ -47,7 +49,7 @@ export async function prepareIsolatedAgentTask( null, agentId, worktree.path, - null, + model, { background: true, requireWorktree: true }, ); if (thread.worktree_path !== worktree.path || !isLiveWorktree(worktree.path, project.path)) { diff --git a/electron/remote-server.test.ts b/electron/remote-server.test.ts index 9dae127..f8d980b 100644 --- a/electron/remote-server.test.ts +++ b/electron/remote-server.test.ts @@ -170,6 +170,17 @@ function installAgent() { getThreadTranscript: vi.fn(() => ({ finalText: null, messages: [] })), getRemotePermissions: vi.fn(() => []), respondToRemotePermission: vi.fn(async () => true), + getThreadModel: vi.fn( + (): { + configId: string; + current: string | null; + options: Array<{ id: string; name: string }>; + } | null => null, + ), + setThreadConfigOption: vi.fn(async () => []), + getModelCatalogs: vi.fn(async () => ({ + "codex-acp": [{ modelId: "gpt-5", name: "GPT-5" }], + })), }; return manager; } @@ -306,3 +317,61 @@ it("checks authentication and agent availability separately from public health", projects: 1, }); }); + +it("seeds the chosen model on the new thread and keeps old fingerprints stable", async () => { + const am = installAgent(); + await post("threads", { ...input, model: "gpt-5" }); + expect(am.createThread).toHaveBeenCalledWith( + "p1", + "Fix login", + null, + "codex-acp", + expect.any(String), + "gpt-5", + { background: true, requireWorktree: true }, + ); + // Same request id with a different model is a different task. + expect((await post("threads", { ...input, model: "o3" })).status).toBe(409); + await post("threads", { ...input, requestId: "request-2" }); + expect(am.createThread).toHaveBeenLastCalledWith( + "p1", + "Fix login", + null, + "codex-acp", + expect.any(String), + null, + { background: true, requireWorktree: true }, + ); +}); + +it("lists models per agent and caches the probe", async () => { + const am = installAgent(); + const get = () => + fetch(`${base}/api/remote/agent-models`, { headers: { Authorization: "Bearer test-token" } }); + expect(await (await get()).json()).toEqual({ + models: { "codex-acp": [{ id: "gpt-5", name: "GPT-5" }] }, + }); + await get(); + expect(am.getModelCatalogs).toHaveBeenCalledTimes(1); +}); + +it("switches a thread's model only to an offered option", async () => { + const am = installAgent(); + await post("threads", input); + expect((await post("threads/t1/model", { model: "gpt-5" })).status).toBe(409); + am.getThreadModel.mockReturnValue({ + configId: "model", + current: "gpt-5", + options: [ + { id: "gpt-5", name: "GPT-5" }, + { id: "o3", name: "o3" }, + ], + }); + expect((await post("threads/t1/model", { model: "nope" })).status).toBe(400); + expect((await post("threads/t1/model", { model: "o3" })).status).toBe(200); + expect(am.setThreadConfigOption).toHaveBeenCalledWith("t1", "model", "o3"); + const report = await fetch(`${base}/api/remote/threads/t1/report`, { + headers: { Authorization: "Bearer test-token" }, + }); + expect((await responseBody(report)).report.model?.options).toHaveLength(2); +}); diff --git a/electron/remote-server.ts b/electron/remote-server.ts index 9c6ce5d..145eadf 100644 --- a/electron/remote-server.ts +++ b/electron/remote-server.ts @@ -15,6 +15,7 @@ import { prepareIsolatedAgentTask } from "./isolated-agent-task.ts"; import { RemoteRequestError, RemoteRequests, getRemoteRequests } from "./remote-requests.ts"; import { gitBinary, isLiveWorktree } from "./worktree-manager.ts"; import type { + RemoteAgentModel, RemoteModel, RemoteProject, RemoteReport, @@ -123,6 +124,10 @@ function isTrustedRemoteHost(host: string): boolean { /** How long after the last authed phone request an idle phone keeps standby. */ const REMOTE_LEASE_MS = 10 * 60_000; +/** Building model catalogs spawns every selected agent and probes sessions, + * so the phone shares one recent result instead of re-probing per request. */ +const AGENT_MODELS_TTL_MS = 5 * 60_000; + export class RemoteServer { private servers: http.Server[] = []; private token: string; @@ -130,6 +135,10 @@ export class RemoteServer { private readonly deps: RemoteServerDeps; private readonly requests: RemoteRequests; private lastAuthedAt = 0; + private agentModels: { + at: number; + value: Promise>; + } | null = null; constructor(deps: RemoteServerDeps, opts?: { port?: number; token?: string }) { this.deps = deps; @@ -343,6 +352,12 @@ export class RemoteServer { })); return send(res, 200, { models }); } + if (req.method === "GET" && path === "/api/remote/agent-models") { + // Models *inside* each agent instance (the ACP model option), keyed by + // the same instance ids `/models` returns. + if (!am) return send(res, 503, { error: "Agent not ready" }); + return send(res, 200, { models: await this.loadAgentModels(am) }); + } if (req.method === "GET" && path === "/api/remote/catalog") { // Same shape as siri-catalog.json on the laptop, so the iOS app's // Siri intents resolve projects/agents against an identical catalog @@ -387,24 +402,35 @@ export class RemoteServer { requestId?: string; projectId?: string; modelId?: string | null; + model?: string | null; prompt?: string; }; if ( typeof body.projectId !== "string" || typeof body.prompt !== "string" || !body.prompt.trim() || - (body.modelId != null && typeof body.modelId !== "string") + (body.modelId != null && typeof body.modelId !== "string") || + (body.model != null && typeof body.model !== "string") ) { return send(res, 400, { error: "projectId and prompt are required" }); } const { projectId } = body; const prompt = body.prompt.trim(); + const model = body.model ?? null; const receipt = await this.requests.submit( body.requestId, - { kind: "create", projectId, agentId: body.modelId ?? null, prompt }, + // `model` joins the fingerprint only when set, so receipts written + // before model choice existed still match their retries. + { + kind: "create", + projectId, + agentId: body.modelId ?? null, + ...(model ? { model } : {}), + prompt, + }, async () => { if (!am) throw new Error("Pipper is still starting on your Mac. No task was started."); - return prepareIsolatedAgentTask(am, projectId, body.modelId, prompt); + return prepareIsolatedAgentTask(am, projectId, body.modelId, prompt, model); }, ); return send(res, receipt.result ? 202 : 409, { @@ -466,6 +492,30 @@ export class RemoteServer { }), }); } + const modelMatch = path.match(/^\/api\/remote\/threads\/([^/]+)\/model$/); + if (req.method === "POST" && modelMatch) { + if (!am) return send(res, 503, { error: "Agent not ready" }); + const threadId = modelMatch[1]!; + if (!getThread(threadId)) return send(res, 404, { error: "Thread not found" }); + const body = JSON.parse((await readBody(req)) || "{}") as { model?: string }; + if (typeof body.model !== "string" || !body.model) { + return send(res, 400, { error: "model is required" }); + } + const current = am.getThreadModel(threadId); + if (!current) { + return send(res, 409, { + error: "This thread can't change models right now. Open it on your Mac and try again.", + }); + } + if (!current.options.some((o) => o.id === body.model)) { + return send(res, 400, { error: "That model isn't offered by this thread's agent." }); + } + await am.setThreadConfigOption(threadId, current.configId, body.model); + const next = am.getThreadModel(threadId); + return send(res, 200, { + model: next ? { current: next.current, options: next.options } : null, + }); + } const controlMatch = path.match(/^\/api\/remote\/threads\/([^/]+)\/(stop|permission)$/); if (req.method === "POST" && controlMatch) { if (!am) return send(res, 503, { error: "Agent not ready" }); @@ -519,6 +569,10 @@ export class RemoteServer { isolationNote: null, permissions: am?.getRemotePermissions(thread.id) ?? [], request: this.requests.latestForThread(thread.id), + model: (() => { + const m = am?.getThreadModel(thread.id); + return m ? { current: m.current, options: m.options } : null; + })(), }; return sendReport(res, { report }); } @@ -537,6 +591,27 @@ export class RemoteServer { } } + private loadAgentModels(am: AgentManager): Promise> { + const cached = this.agentModels; + if (cached && Date.now() - cached.at < AGENT_MODELS_TTL_MS) return cached.value; + const value = am + .getModelCatalogs() + .then((catalogs) => + Object.fromEntries( + Object.entries(catalogs).map(([agentId, models]) => [ + agentId, + models.map((m) => ({ id: m.modelId, name: m.name })), + ]), + ), + ); + this.agentModels = { at: Date.now(), value }; + // A failed probe must not be served for the whole TTL. + value.catch(() => { + if (this.agentModels?.value === value) this.agentModels = null; + }); + return value; + } + private serveFile(res: http.ServerResponse, rel: string, contentType?: string): void { try { const file = join(this.deps.getRendererDir(), rel); diff --git a/native/pipper-remote-ios/App/Keychain.swift b/native/pipper-remote-ios/App/Keychain.swift index eef1013..5da4a14 100644 --- a/native/pipper-remote-ios/App/Keychain.swift +++ b/native/pipper-remote-ios/App/Keychain.swift @@ -64,3 +64,4 @@ enum Keychain { SecItemDelete(query as CFDictionary) } } + diff --git a/native/pipper-remote-ios/App/PipperRemoteApp.swift b/native/pipper-remote-ios/App/PipperRemoteApp.swift index fac3585..f7c5cb8 100644 --- a/native/pipper-remote-ios/App/PipperRemoteApp.swift +++ b/native/pipper-remote-ios/App/PipperRemoteApp.swift @@ -29,13 +29,79 @@ struct RootView: View { var body: some View { if session.isPaired { - ThreadListView() + MainTabView() } else { PairingView() } } } +/// Paired shell: Threads and Settings, with New split off as its own +/// trailing "+" button (the tab bar's separated search-role slot). +struct MainTabView: View { + @Environment(RemoteSession.self) private var session + enum TabID: Hashable { case threads, new, settings } + @State private var tab: TabID = .threads + /// Same key Home uses for its selected project. + @AppStorage("home.projectId") private var homeProjectId = "" + + /// iOS 27's prominent role is the separated trailing action; on earlier + /// systems the search role gets the same split-off placement. + /// Drawn rather than palette-tinted so the tab bar can't recolor it. + private static let newTabIcon: UIImage = { + let size = CGSize(width: 34, height: 34) + let image = UIGraphicsImageRenderer(size: size).image { _ in + UIColor.systemIndigo.setFill() + UIBezierPath(ovalIn: CGRect(origin: .zero, size: size)).fill() + let plus = UIImage( + systemName: "plus", + withConfiguration: UIImage.SymbolConfiguration(pointSize: 16, weight: .bold))? + .withTintColor(.white, renderingMode: .alwaysOriginal) + if let plus { + plus.draw(at: CGPoint(x: (size.width - plus.size.width) / 2, y: (size.height - plus.size.height) / 2)) + } + } + return image.withRenderingMode(.alwaysOriginal) + }() + + private static var newTabRole: TabRole { + if #available(iOS 27.0, *) { return .prominent } + return .search + } + + var body: some View { + TabView(selection: $tab) { + Tab("Threads", systemImage: "square.grid.2x2", value: TabID.threads) { + ThreadListView() + } + Tab("Settings", systemImage: "gearshape", value: TabID.settings) { + SettingsView(inTab: true) + } + Tab(value: TabID.new, role: Self.newTabRole) { + NewThreadSheet( + onCreated: { thread in + // Home opens this thread via the same hand-off Siri uses. + homeProjectId = thread.projectId + session.lastSiriThreadId = thread.id + tab = .threads + }, + initialProjectId: homeProjectId.isEmpty ? nil : homeProjectId, + inTab: true) + } label: { + // Tab bars template-render SF Symbols; a pre-colored image keeps the + // filled indigo circle so the action stands out. + Label { + Text("New") + } icon: { + Image(uiImage: Self.newTabIcon) + } + } + } + // Colors the prominent "+" and the selected tab. + .tint(.indigo) + } +} + #if DEBUG #Preview("Root — unpaired") { RootView() diff --git a/native/pipper-remote-ios/App/RemoteSession.swift b/native/pipper-remote-ios/App/RemoteSession.swift index 70eada1..e42baf5 100644 --- a/native/pipper-remote-ios/App/RemoteSession.swift +++ b/native/pipper-remote-ios/App/RemoteSession.swift @@ -20,19 +20,40 @@ final class RemoteSession { private(set) var catalog: RemoteCatalog private(set) var catalogError: String? private(set) var lastCatalogRefresh: Date? + /// Models inside each agent, keyed by agent id. Empty until fetched, and on + /// Macs that predate model choice. + private(set) var agentModels: [String: [RemoteAgentModel]] = [:] + private(set) var loadingAgentModels = false + /// False once the Mac answered 404: its Pipper predates model choice. + private(set) var agentModelsSupported = true + private(set) var agentModelsError: String? let catalogStore = CatalogStore.standard() private let submissions = RemoteSubmissionStore() #if DEBUG private var isPreview = false + + /// Debug builds auto-pair to this Mac so testing skips the QR flow, but + /// only when nothing is stored: a real (re-)pairing always wins, so a stale + /// token here can't mask it. In memory only, nothing is persisted. + /// Never compiled into Release. + private static let devPairing: RemoteConfig? = RemoteConfig( + host: "100.82.38.10", port: 4173, + token: "3433463b635681a46d5d10019562a495e2a65cb202dd010f") #endif - func createThread(projectId: String, agentId: String?, prompt: String) async throws -> RemoteThreadSummary { + func createThread( + projectId: String, agentId: String?, model: String? = nil, prompt: String + ) async throws -> RemoteThreadSummary { guard let client, let config else { throw RemoteClientError.notPaired } - let scope = [config.host, String(config.port), "create", projectId, agentId ?? "", prompt] + // `model` joins the scope only when set, keeping pending IDs from before + // model choice stable. + let scope = [config.host, String(config.port), "create", projectId, agentId ?? ""] + + (model.map { ["model:\($0)"] } ?? []) + [prompt] let id = try submissions.requestId(for: scope) do { - let thread = try await client.createThread(projectId: projectId, agentId: agentId, prompt: prompt, requestId: id) + let thread = try await client.createThread( + projectId: projectId, agentId: agentId, model: model, prompt: prompt, requestId: id) try submissions.acknowledge(scope, requestId: id) return thread } catch RemoteClientError.rejected(let message) { @@ -67,13 +88,17 @@ final class RemoteSession { } catalog = catalogStore.load() ?? .empty lastCatalogRefresh = catalogStore.modifiedAt + #if DEBUG + if config == nil, let devPairing = Self.devPairing { config = devPairing } + #endif } #if DEBUG /// Preview-only initializer: seeds a catalog without touching the Keychain, /// UserDefaults, or the shared on-disk cache. The paired state uses a dummy /// config, while `client` remains nil so previews never make network requests. - init(previewCatalog: RemoteCatalog, paired: Bool = false) { + init(previewCatalog: RemoteCatalog, paired: Bool = false, agentModels: [String: [RemoteAgentModel]] = [:]) { + self.agentModels = agentModels config = paired ? RemoteConfig(host: "preview.invalid", port: RemoteConfig.defaultPort, token: "preview") : nil catalog = previewCatalog catalogError = nil @@ -83,8 +108,10 @@ final class RemoteSession { } /// A detached session for SwiftUI previews. - static func preview(catalog: RemoteCatalog = .empty, paired: Bool = false) -> RemoteSession { - RemoteSession(previewCatalog: catalog, paired: paired) + static func preview( + catalog: RemoteCatalog = .empty, paired: Bool = false, agentModels: [String: [RemoteAgentModel]] = [:] + ) -> RemoteSession { + RemoteSession(previewCatalog: catalog, paired: paired, agentModels: agentModels) } #endif @@ -140,6 +167,24 @@ final class RemoteSession { } } + /// Best effort: an older Mac (404) or a slow agent probe leaves the last + /// list in place, and the picker falls back to the agent's default. + func refreshAgentModels() async { + guard let client, !loadingAgentModels else { return } + loadingAgentModels = true + defer { loadingAgentModels = false } + do { + agentModels = try await client.agentModels() + agentModelsSupported = true + agentModelsError = nil + } catch RemoteClientError.http(status: 404, _) { + agentModelsSupported = false + agentModelsError = nil + } catch { + agentModelsError = error.localizedDescription + } + } + /// Refresh only when the cache is missing or older than `maxAge`. func refreshCatalogIfStale(maxAge: TimeInterval = 10 * 60) async { if let last = lastCatalogRefresh, Date().timeIntervalSince(last) < maxAge, !catalog.projects.isEmpty { @@ -172,18 +217,42 @@ enum PreviewData { RemoteCatalogAgent(id: "cursor", displayName: "Cursor", available: false), ]) + /// Milliseconds since 1970, like `lastUsedAt` from the Mac. + private static func minutesAgo(_ minutes: Double) -> Double { + (Date().timeIntervalSince1970 - minutes * 60) * 1000 + } + static let threads: [RemoteThreadSummary] = [ RemoteThreadSummary( id: "a1b2c3d4-0000-0000-0000-000000000001", projectId: "folklore", worktreePath: "~/code/folklore/.worktrees/a1b2c3d4", title: "Add dark mode toggle", - running: true, lastUsedAt: 0), + running: true, lastUsedAt: minutesAgo(1)), RemoteThreadSummary( id: "e5f6a7b8-0000-0000-0000-000000000002", projectId: "omni", - worktreePath: nil, title: "Summarize the launch plan", running: false, lastUsedAt: 0), + worktreePath: nil, title: "Summarize the launch plan", running: false, lastUsedAt: minutesAgo(25)), RemoteThreadSummary( id: "c9d0e1f2-0000-0000-0000-000000000003", projectId: "folklore", worktreePath: "~/code/folklore/.worktrees/c9d0e1f2", title: nil, running: false, - lastUsedAt: 0), + lastUsedAt: minutesAgo(90)), + RemoteThreadSummary( + id: "d3e4f5a6-0000-0000-0000-000000000004", projectId: "omni", + worktreePath: "~/code/omni/.worktrees/d3e4f5a6", title: "Read the codebase", running: false, + lastUsedAt: minutesAgo(60 * 26)), + RemoteThreadSummary( + id: "b7c8d9e0-0000-0000-0000-000000000005", projectId: "folklore", + worktreePath: "~/code/folklore/.worktrees/b7c8d9e0", title: "Fix onboarding crash", running: false, + lastUsedAt: minutesAgo(60 * 24 * 3)), + ] + + static let agentModels: [String: [RemoteAgentModel]] = [ + "codex": [ + RemoteAgentModel(id: "gpt-5", name: "GPT-5"), + RemoteAgentModel(id: "gpt-5-codex", name: "GPT-5 Codex"), + ], + "claude": [ + RemoteAgentModel(id: "sonnet", name: "Sonnet"), + RemoteAgentModel(id: "opus", name: "Opus"), + ], ] static let report = RemoteReport( @@ -196,7 +265,7 @@ enum PreviewData { RemoteMessage( role: .agent, text: - "Done. I added a **Dark mode** toggle to `SettingsView`, bound to `@AppStorage(\"darkMode\")`.\n\n- Toggle in Settings\n- Applies `preferredColorScheme` at the root" + "## Dark mode\n\nDone. I added a **Dark mode** toggle to `SettingsView`, bound to `@AppStorage(\"darkMode\")`.\n\n- Toggle in Settings\n- Applies `preferredColorScheme` at the root\n\n```swift\n@AppStorage(\"darkMode\") private var darkMode = false\n```\n\n| File | Change |\n| --- | --- |\n| SettingsView.swift | Added toggle |\n| PipperRemoteApp.swift | Applies scheme |" ), RemoteMessage(role: .user, text: "Nice — does it survive relaunch?"), RemoteMessage(role: .agent, text: "Yes, `@AppStorage` persists it across launches."), @@ -207,7 +276,8 @@ enum PreviewData { isolated: true, isolationNote: nil, permissions: nil, - request: nil) + request: nil, + model: RemoteThreadModel(current: "gpt-5", options: agentModels["codex"] ?? [])) static let reportNeedsInput = RemoteReport( threadId: threads[2].id, diff --git a/native/pipper-remote-ios/App/Simulator.entitlements b/native/pipper-remote-ios/App/Simulator.entitlements new file mode 100644 index 0000000..f4b88aa --- /dev/null +++ b/native/pipper-remote-ios/App/Simulator.entitlements @@ -0,0 +1,19 @@ + + + + + + application-identifier + com.maker-or.omni.remote + keychain-access-groups + + com.maker-or.omni.remote + + get-task-allow + + + diff --git a/native/pipper-remote-ios/App/Views/SettingsView.swift b/native/pipper-remote-ios/App/Views/SettingsView.swift index 3ea1cd3..f44b8b8 100644 --- a/native/pipper-remote-ios/App/Views/SettingsView.swift +++ b/native/pipper-remote-ios/App/Views/SettingsView.swift @@ -5,6 +5,8 @@ struct SettingsView: View { @Environment(RemoteSession.self) private var session @Environment(\.dismiss) private var dismiss @State private var refreshing = false + /// Shown as a tab rather than a sheet, so there's nothing to dismiss. + var inTab = false var body: some View { NavigationStack { @@ -76,8 +78,10 @@ struct SettingsView: View { } .navigationTitle("Settings") .toolbar { - ToolbarItem(placement: .confirmationAction) { - Button("Done") { dismiss() } + if !inTab { + ToolbarItem(placement: .confirmationAction) { + Button("Done") { dismiss() } + } } } } @@ -94,6 +98,9 @@ struct ConnectionCheckView: View { @State private var checking = false @State private var checkedAt: Date? @State private var showSample = false + /// The Mac answered but predates /api/remote/diagnostics (404). The + /// pairing works; only the newer endpoints are missing. + @State private var macOutdated = false var body: some View { Section("Connection checks") { @@ -109,7 +116,11 @@ struct ConnectionCheckView: View { showSample = false }, sampleTask: true) } - if let error { + if macOutdated { + Label("Mac reachable · pairing accepted", systemImage: "checkmark.circle") + Text("Pipper on your Mac is older than this app, so connection checks and Siri project names aren't available. Update Pipper on your Mac.") + .font(.footnote).foregroundStyle(.orange) + } else if let error { Text(error).font(.footnote).foregroundStyle(.red) Text("Keep Pipper open on the Mac and connect both devices to the same Tailscale network.") .font(.footnote).foregroundStyle(.secondary) @@ -134,11 +145,22 @@ struct ConnectionCheckView: View { guard let client = session.client, !checking else { return } checking = true error = nil + macOutdated = false defer { checking = false } do { diagnostics = try await client.diagnostics() checkedAt = Date() await session.refreshCatalog() + } catch RemoteClientError.http(status: 404, _) { + // Older Macs lack diagnostics, and health needs no token, so + // confirm the pairing against an endpoint every version serves. + do { + _ = try await client.listThreads() + macOutdated = true + checkedAt = Date() + } catch { + self.error = error.localizedDescription + } } catch { self.error = error.localizedDescription } diff --git a/native/pipper-remote-ios/App/Views/ThreadDetailView.swift b/native/pipper-remote-ios/App/Views/ThreadDetailView.swift index 800b940..00171a1 100644 --- a/native/pipper-remote-ios/App/Views/ThreadDetailView.swift +++ b/native/pipper-remote-ios/App/Views/ThreadDetailView.swift @@ -1,4 +1,5 @@ import SwiftUI +import Textual /// One thread's transcript (polled every 3s — the laptop holds back /// in-progress agent text, so replies arrive whole) plus a follow-up box. @@ -14,15 +15,14 @@ struct ThreadDetailView: View { self.threadId = threadId if let previewReport { _report = State(initialValue: previewReport) - _lastUpdated = State(initialValue: Date()) } } #endif @State private var report: RemoteReport? @State private var loadError: String? - @State private var lastUpdated: Date? @State private var controlling = false + @State private var switchingModel = false @State private var loading = false @State private var draft = "" @State private var sending = false @@ -55,13 +55,10 @@ struct ThreadDetailView: View { VStack(spacing: 0) { ScrollViewReader { proxy in ScrollView { - LazyVStack(alignment: .leading, spacing: 10) { + // Plain VStack: Markdown rows settle their height after layout, and + // a lazy stack's height estimates for off-screen rows make scrolling jump. + VStack(alignment: .leading, spacing: 10) { if let report { - StatusCard(report: report) - if let lastUpdated { - Text("Updated \(lastUpdated.formatted(date: .omitted, time: .standard))") - .font(.caption).foregroundStyle(.secondary) - } if let loadError { Text("Connection lost. Showing the last update. \(loadError)") .font(.footnote).foregroundStyle(.orange) @@ -87,11 +84,6 @@ struct ThreadDetailView: View { } .padding().background(.thinMaterial, in: RoundedRectangle(cornerRadius: 12)) } - if report.running || !(report.permissions ?? []).isEmpty { - Button("Stop this thread", role: .destructive) { - Task { await control() } - }.buttonStyle(.bordered).disabled(controlling) - } ForEach(Array(report.messages.enumerated()), id: \.offset) { _, m in Bubble(role: m.role, text: m.text) } @@ -112,7 +104,10 @@ struct ThreadDetailView: View { } .padding(12) } - .defaultScrollAnchor(.bottom) + // Start at the bottom only. Pinning on every size change would yank + // readers back down as Markdown re-lays out; sticky-bottom below + // handles following new content. + .defaultScrollAnchor(.bottom, for: .initialOffset) .scrollDismissesKeyboard(.interactively) .onScrollGeometryChange(for: Bool.self) { geo in geo.contentOffset.y + geo.containerSize.height >= geo.contentSize.height - 120 @@ -129,32 +124,114 @@ struct ThreadDetailView: View { } } } - if let sendError { - Text(sendError).font(.footnote).foregroundStyle(.red).padding(.horizontal) - } - Divider() - HStack(alignment: .bottom) { - TextField("Follow up…", text: $draft, axis: .vertical) - .lineLimit(1...5) - .textFieldStyle(.roundedBorder) - Button { - Task { await send() } - } label: { - Image(systemName: "paperplane.fill") - } - .buttonStyle(.borderedProminent) - .disabled(draft.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty || sending || report?.running == true) - .accessibilityLabel("Send follow-up") - } - .padding(12) + composer } .navigationTitle(report?.summary ?? "Thread") .navigationBarTitleDisplayMode(.inline) + .toolbar { + if let model = report?.model { + ToolbarItem(placement: .topBarTrailing) { modelMenu(model) } + } + } .task(id: "\(threadId)-\(scenePhase == .active)") { if scenePhase == .active { await poll() } } } + /// Applies to the next turn, so it's locked while the Mac is working. + private func modelMenu(_ model: RemoteThreadModel) -> some View { + Menu { + Picker("Model", selection: Binding( + get: { model.current ?? "" }, + set: { next in Task { await setModel(next) } } + )) { + ForEach(model.options) { m in + Text(m.name).tag(m.id) + } + } + } label: { + HStack(spacing: 3) { + Text(model.currentName ?? "Model") + Image(systemName: "chevron.up.chevron.down").imageScale(.small) + } + .font(.footnote) + } + .disabled(report?.running == true || switchingModel || controlling) + .accessibilityLabel("Model: \(model.currentName ?? "default")") + } + + private func setModel(_ next: String) async { + guard let client = session.client, !switchingModel, next != report?.model?.current else { return } + switchingModel = true + sendError = nil + defer { switchingModel = false } + do { + let updated = try await client.setModel(threadId: threadId, model: next) + report?.model = updated + } catch { + sendError = error.localizedDescription + } + } + + private var canSend: Bool { + !draft.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty && !sending && report?.running != true + } + + /// Message-style composer: one rounded field with the action button inside. + /// While the Mac is working the button stops the thread instead of sending. + private var composer: some View { + VStack(alignment: .leading, spacing: 6) { + if let sendError { + Text(sendError).font(.footnote).foregroundStyle(.red).padding(.horizontal, 4) + } + HStack(alignment: .bottom, spacing: 6) { + TextField(report?.running == true ? "Working on your Mac…" : "Follow up…", text: $draft, axis: .vertical) + .lineLimit(1...6) + .padding(.leading, 16) + .padding(.vertical, 10) + composerButton + .padding(5) + } + .background(Color(.secondarySystemBackground), in: RoundedRectangle(cornerRadius: 22, style: .continuous)) + .overlay( + RoundedRectangle(cornerRadius: 22, style: .continuous) + .strokeBorder(Color(.separator).opacity(0.6), lineWidth: 0.5) + ) + } + .padding(.horizontal, 12) + .padding(.vertical, 8) + .background(.bar) + } + + @ViewBuilder private var composerButton: some View { + if report?.running == true { + Button { + Task { await control() } + } label: { + Image(systemName: "stop.fill") + .font(.system(size: 12, weight: .bold)) + .foregroundStyle(Color(.systemBackground)) + .frame(width: 32, height: 32) + .background(Color.primary, in: Circle()) + } + .disabled(controlling) + .accessibilityLabel("Stop this thread") + } else { + Button { + Task { await send() } + } label: { + Image(systemName: "arrow.up") + .font(.system(size: 15, weight: .bold)) + .foregroundStyle(.white) + .frame(width: 32, height: 32) + .background(canSend ? Color.accentColor : Color(.systemGray4), in: Circle()) + } + .disabled(!canSend) + .animation(.easeOut(duration: 0.15), value: canSend) + .accessibilityLabel("Send follow-up") + } + } + private var pendingVisible: String? { guard let pending, let report else { return nil } let count = report.messages.filter { $0.role == .user && $0.text == pending.text }.count @@ -185,7 +262,6 @@ struct ThreadDetailView: View { let next = try await client.report(threadId: threadId) guard !Task.isCancelled else { return } if next != report { report = next } - lastUpdated = Date() if next.request?.state == "failed" || next.request?.state == "interrupted" { pending = nil } loadError = nil if let p = pending, next.messages.filter({ $0.role == .user && $0.text == p.text }).count > p.known { @@ -237,90 +313,34 @@ struct ThreadDetailView: View { } } -private struct StatusCard: View { - let report: RemoteReport - - var body: some View { - DisclosureGroup { - VStack(alignment: .leading, spacing: 6) { - if !report.isolated { - Label( - "Ran in project root — no isolated workspace." + (report.isolationNote.map { " \($0)" } ?? ""), - systemImage: "exclamationmark.triangle") - .font(.footnote) - .foregroundStyle(.orange) - } - if let wt = report.worktreePath { - Text(wt).font(.caption.monospaced()).foregroundStyle(.secondary) - } - if !report.filesTouched.isEmpty { - ForEach(report.filesTouched, id: \.self) { f in - Text(f).font(.caption.monospaced()) - } - } - } - .padding(.top, 4) - } label: { - HStack(spacing: 8) { - Circle().fill(report.running ? Color.green : Color.secondary.opacity(0.4)).frame(width: 8, height: 8) - Text(!(report.permissions ?? []).isEmpty ? "Needs your input" : report.running ? "Running on Mac" : "Not running") - if let p = report.projectName { - Text("· \(p)").foregroundStyle(.secondary) - } - Spacer() - if !report.filesTouched.isEmpty { - Text("\(report.filesTouched.count) files").font(.caption).foregroundStyle(.secondary) - } - } - .font(.subheadline) - } - .padding(10) - .background(.thinMaterial, in: RoundedRectangle(cornerRadius: 12)) - } -} - private struct Bubble: View { let role: RemoteMessage.Role let text: String var footnote: String? = nil var body: some View { - HStack { - if role == .user { Spacer(minLength: 40) } - VStack(alignment: .trailing, spacing: 3) { - Group { - if role == .user { - Text(text) - } else { - Text(markdown: text) + if role == .user { + HStack { + Spacer(minLength: 40) + VStack(alignment: .trailing, spacing: 3) { + Text(text) + .textSelection(.enabled) + .padding(.horizontal, 12) + .padding(.vertical, 8) + .background(Color.accentColor, in: RoundedRectangle(cornerRadius: 16)) + .foregroundStyle(.white) + if let footnote { + Text(footnote).font(.caption2).foregroundStyle(.secondary) } } - .textSelection(.enabled) - .padding(.horizontal, 12) - .padding(.vertical, 8) - .background( - role == .user ? Color.accentColor : Color(.secondarySystemBackground), - in: RoundedRectangle(cornerRadius: 16)) - .foregroundStyle(role == .user ? Color.white : Color.primary) - if let footnote { - Text(footnote).font(.caption2).foregroundStyle(.secondary) - } } - if role == .agent { Spacer(minLength: 40) } - } - } -} - -extension Text { - /// Best-effort Markdown; falls back to plain text on parse failure. - init(markdown: String) { - if let attributed = try? AttributedString( - markdown: markdown, - options: .init(interpretedSyntax: .inlineOnlyPreservingWhitespace)) - { - self.init(attributed) } else { - self.init(markdown) + // Agent replies are full Markdown (headings, lists, code, tables) and + // get the whole width, with no bubble, so wide blocks have room. + StructuredText(markdown: text) + .textual.textSelection(.enabled) + .frame(maxWidth: .infinity, alignment: .leading) + .padding(.horizontal, 4) } } } diff --git a/native/pipper-remote-ios/App/Views/ThreadListView.swift b/native/pipper-remote-ios/App/Views/ThreadListView.swift index d8b11c2..eef29f4 100644 --- a/native/pipper-remote-ios/App/Views/ThreadListView.swift +++ b/native/pipper-remote-ios/App/Views/ThreadListView.swift @@ -1,19 +1,20 @@ import AppIntents import SwiftUI -/// Home: recent threads on the Mac (polled), plus a composer for new work. -/// Siri-created threads are opened automatically on next foreground. +/// Home: one project's threads on the Mac (polled) as a staggered card grid. +/// The large title is the project picker. Siri-created threads are opened +/// automatically on next foreground. struct ThreadListView: View { @Environment(RemoteSession.self) private var session @Environment(\.scenePhase) private var scenePhase @State private var threads: [RemoteThreadSummary] = [] @State private var loadError: String? - @State private var showNew = false - @State private var showSettings = false @State private var path: [String] = [] + /// "" until chosen; then falls back to the most recently active project. + @AppStorage("home.projectId") private var storedProjectId = "" #if DEBUG - /// Preview-only seed so the list is shown populated; the default `[]` + /// Preview-only seed so the grid is shown populated; the default `[]` /// keeps the production call site (`ThreadListView()`) unchanged. init(previewThreads: [RemoteThreadSummary] = []) { _threads = State(initialValue: previewThreads) @@ -22,50 +23,38 @@ struct ThreadListView: View { var body: some View { NavigationStack(path: $path) { - List { - ConnectionCheckView() - if let loadError { - Text(loadError).foregroundStyle(.red).font(.footnote) - } - if threads.isEmpty && loadError == nil { - ContentUnavailableView { - Label("No threads yet", systemImage: "bubble.left.and.text.bubble.right") - } description: { - Text("Ask Siri: “Start a Pipper thread in \(session.catalog.projects.first?.name ?? "your project")”, or tap +.") + ScrollView { + VStack(alignment: .leading, spacing: 16) { + HStack(alignment: .center) { + ProfileAvatar() + Spacer(minLength: 12) + + projectMenu } - } - ForEach(threads) { t in - NavigationLink(value: t.id) { - ThreadRow(thread: t, projectName: session.catalog.project(id: t.projectId)?.name) + if let loadError { + Text(loadError).foregroundStyle(.red).font(.footnote) + } + if visibleThreads.isEmpty && loadError == nil { + ContentUnavailableView { + Label("No threads yet", systemImage: "bubble.left.and.text.bubble.right") + } description: { + Text("Ask Siri: “Start a Pipper thread in \(selectedProjectName ?? "your project")”, or tap +.") + } + .padding(.top, 40) + } else { + ThreadGrid(threads: visibleThreads) } } - Section { - SiriTipView(intent: StartThreadIntent()) - } - .listRowBackground(Color.clear) - .listRowInsets(EdgeInsets()) + .padding(.horizontal, 16) + .padding(.bottom, 24) } - .navigationTitle("Pipper") + // The project menu in the content is the title; keep the bar empty. + .navigationTitle("") + .navigationBarTitleDisplayMode(.inline) .navigationDestination(for: String.self) { id in + // Reading a thread is full-screen: the composer owns the bottom edge. ThreadDetailView(threadId: id) - } - .toolbar { - ToolbarItem(placement: .topBarLeading) { - Button { showSettings = true } label: { Image(systemName: "gearshape") } - } - ToolbarItem(placement: .topBarTrailing) { - Button { showNew = true } label: { Image(systemName: "plus") } - } - } - .sheet(isPresented: $showNew) { - NewThreadSheet { created in - showNew = false - threads.insert(created, at: 0) - path = [created.id] - } - } - .sheet(isPresented: $showSettings) { - SettingsView() + .toolbar(.hidden, for: .tabBar) } .refreshable { await load() } .task(id: scenePhase == .active) { if scenePhase == .active { await poll() } } @@ -79,6 +68,63 @@ struct ThreadListView: View { } } + /// Large project name with an up/down chevron; tapping switches project. + private var projectMenu: some View { + Menu { + Picker("Project", selection: projectBinding) { + ForEach(projectChoices, id: \.id) { p in + Text(p.name).tag(p.id) + } + } + } label: { + HStack(alignment: .firstTextBaseline, spacing: 6) { + Text(selectedProjectName ?? "Pipper") + .font(.largeTitle.bold()) + .fontDesign(.rounded) + .lineLimit(1) + Image(systemName: "chevron.up.chevron.down") + .font(.title3.weight(.semibold)) + .foregroundStyle(.secondary) + } + .foregroundStyle(.primary) + } + .tint(.primary) + .disabled(projectChoices.count < 2) + .padding(.top, 4) + } + + /// Newest first; the Mac's order isn't guaranteed to be by recency. + private var sortedThreads: [RemoteThreadSummary] { + threads.sorted { $0.lastUsedAt > $1.lastUsedAt } + } + + /// Catalog projects, plus any project a thread references that the catalog + /// doesn't list yet, ordered by most recent activity. + private var projectChoices: [(id: String, name: String)] { + var ids: [String] = [] + for t in sortedThreads where !ids.contains(t.projectId) { ids.append(t.projectId) } + for p in session.catalog.projects where !ids.contains(p.id) { ids.append(p.id) } + return ids.map { ($0, session.catalog.project(id: $0)?.name ?? $0) } + } + + /// The stored choice while it still exists, else the most active project. + private var selectedProjectId: String? { + if projectChoices.contains(where: { $0.id == storedProjectId }) { return storedProjectId } + return projectChoices.first?.id + } + + private var selectedProjectName: String? { + selectedProjectId.flatMap { id in projectChoices.first { $0.id == id }?.name } + } + + private var projectBinding: Binding { + Binding(get: { selectedProjectId ?? "" }, set: { storedProjectId = $0 }) + } + + private var visibleThreads: [RemoteThreadSummary] { + sortedThreads.filter { $0.projectId == selectedProjectId } + } + private func openSiriThreadIfAny() { guard let id = session.lastSiriThreadId else { return } session.lastSiriThreadId = nil @@ -104,27 +150,84 @@ struct ThreadListView: View { } } -private struct ThreadRow: View { +/// Signed-in user's avatar. Hardcoded until accounts exist. +private struct ProfileAvatar: View { + private let initials = "HP" + + var body: some View { + Text(initials) + .font(.subheadline.weight(.semibold)) + .foregroundStyle(.white) + .frame(width: 38, height: 38) + .background( + LinearGradient(colors: [.blue, .blue], startPoint: .topLeading, endPoint: .bottomTrailing), + in: Circle()) + .accessibilityLabel("Profile") + } +} + +/// Two columns of equal cards; the right column starts lower so the grid +/// reads as staggered. Threads fill left, right, left… in recency order. +private struct ThreadGrid: View { + let threads: [RemoteThreadSummary] + private let spacing: CGFloat = 14 + + var body: some View { + HStack(alignment: .top, spacing: spacing) { + column(stride(from: 0, to: threads.count, by: 2).map { threads[$0] }) + column(stride(from: 1, to: threads.count, by: 2).map { threads[$0] }) + .padding(.top, 36) + } + } + + private func column(_ items: [RemoteThreadSummary]) -> some View { + VStack(spacing: spacing) { + ForEach(items) { t in + NavigationLink(value: t.id) { ThreadCard(thread: t) } + .buttonStyle(.plain) + } + } + .frame(maxWidth: .infinity, alignment: .top) + } +} + +private struct ThreadCard: View { let thread: RemoteThreadSummary - let projectName: String? var body: some View { - HStack(spacing: 10) { - Circle() - .fill(thread.running ? Color.green : Color.secondary.opacity(0.4)) - .frame(width: 8, height: 8) - VStack(alignment: .leading, spacing: 2) { - Text(thread.title ?? String(thread.id.prefix(8))) - .lineLimit(1) - HStack(spacing: 6) { - if let projectName { Text(projectName) } - if thread.worktreePath == nil { Text("· project root") } - Text(thread.running ? "· running" : "") - } + VStack(spacing: 8) { + Text(thread.title ?? String(thread.id.prefix(8))) + .font(.headline) + .fontDesign(.rounded) + .multilineTextAlignment(.center) + .lineLimit(5) + .frame(maxWidth: .infinity) + Spacer(minLength: 0) + Text(subtitle) .font(.caption) - .foregroundStyle(.secondary) - } + .foregroundStyle(thread.running ? Color.green : Color.secondary) + .multilineTextAlignment(.center) + .lineLimit(2) } + .padding(14) + .frame(height: 200) + .background(Color(.secondarySystemBackground), in: Self.shape) + .contentShape(Self.shape) + } + + /// One fixed radius. ConcentricRectangle resolves against the display + /// corners, so in a scroll view cards would change shape as they pass the + /// screen's rounded corners; scrolling content keeps a constant radius. + private static let shape = RoundedRectangle(cornerRadius: 28, style: .continuous) + + private var subtitle: String { + var parts = [ + thread.running + ? "Running" + : Date(timeIntervalSince1970: thread.lastUsedAt / 1000).formatted(.relative(presentation: .named)) + ] + if thread.worktreePath == nil { parts.append("project root") } + return parts.joined(separator: " · ") } } @@ -133,9 +236,16 @@ struct NewThreadSheet: View { @Environment(RemoteSession.self) private var session @Environment(\.dismiss) private var dismiss let onCreated: (RemoteThreadSummary) -> Void + /// Preselected project (the one shown on Home); nil picks the first. + var initialProjectId: String? = nil + /// Shown as a tab rather than a sheet: no Cancel, and the form resets + /// after starting so the tab is ready for the next task. + var inTab = false @State private var projectId = "" @State private var agentId = "" + /// Model inside the agent; "" keeps the agent's default. + @State private var model = "" @State private var prompt = "" var sampleTask = false @State private var sending = false @@ -157,7 +267,30 @@ struct NewThreadSheet: View { Text(a.displayName).tag(a.id) } } + if !models.isEmpty { + Picker("Model", selection: $model) { + Text("Agent default").tag("") + ForEach(models) { m in + Text(m.name).tag(m.id) + } + } + } else if session.loadingAgentModels { + LabeledContent("Model") { ProgressView().controlSize(.small) } + } else { + LabeledContent("Model", value: "Agent default") + } + } footer: { + if !session.agentModelsSupported { + Text("Update Pipper on your Mac to choose a model.") + } else if let modelError = session.agentModelsError, models.isEmpty { + VStack(alignment: .leading, spacing: 4) { + Text("Couldn't load models: \(modelError)") + Button("Retry") { Task { await session.refreshAgentModels() } } + .font(.footnote) + } + } } + .onChange(of: agentId) { _, _ in model = "" } Section("Task") { TextField("What should the agent do?", text: $prompt, axis: .vertical) .lineLimit(3...8) @@ -177,8 +310,10 @@ struct NewThreadSheet: View { .navigationBarTitleDisplayMode(.inline) .interactiveDismissDisabled(sending) .toolbar { - ToolbarItem(placement: .cancellationAction) { - Button("Cancel") { dismiss() }.disabled(sending) + if !inTab { + ToolbarItem(placement: .cancellationAction) { + Button("Cancel") { dismiss() }.disabled(sending) + } } ToolbarItem(placement: .confirmationAction) { Button("Start") { Task { await start() } } @@ -190,11 +325,26 @@ struct NewThreadSheet: View { prompt = "Describe this project's purpose in one sentence. Do not change files or run commands." } await session.refreshCatalogIfStale() - if projectId.isEmpty, let first = session.catalog.projects.first { projectId = first.id } + if projectId.isEmpty { + if let initialProjectId, session.catalog.project(id: initialProjectId) != nil { + projectId = initialProjectId + } else if let first = session.catalog.projects.first { + projectId = first.id + } + } + await session.refreshAgentModels() } } } + private var effectiveAgentId: String? { + agentId.isEmpty ? session.catalog.preferredAgent?.id : agentId + } + + private var models: [RemoteAgentModel] { + effectiveAgentId.flatMap { session.agentModels[$0] } ?? [] + } + private func start() async { guard session.isPaired, !sending else { return } sending = true @@ -203,8 +353,10 @@ struct NewThreadSheet: View { do { let thread = try await session.createThread( projectId: projectId, - agentId: agentId.isEmpty ? session.catalog.preferredAgent?.id : agentId, + agentId: effectiveAgentId, + model: model.isEmpty ? nil : model, prompt: prompt.trimmingCharacters(in: .whitespacesAndNewlines)) + if inTab { prompt = "" } onCreated(thread) } catch { self.error = error.localizedDescription @@ -225,6 +377,6 @@ struct NewThreadSheet: View { #Preview("New thread") { NewThreadSheet { _ in } - .environment(RemoteSession.preview(catalog: PreviewData.catalog)) + .environment(RemoteSession.preview(catalog: PreviewData.catalog, agentModels: PreviewData.agentModels)) } #endif diff --git a/native/pipper-remote-ios/PipperRemote.xcodeproj/project.pbxproj b/native/pipper-remote-ios/PipperRemote.xcodeproj/project.pbxproj index caf2cf5..6deb836 100644 --- a/native/pipper-remote-ios/PipperRemote.xcodeproj/project.pbxproj +++ b/native/pipper-remote-ios/PipperRemote.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + B20A00000000000000000003 /* Textual in Frameworks */ = {isa = PBXBuildFile; productRef = B20A00000000000000000002 /* Textual */; }; B20100000000000000000001 /* RemoteModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = B20200000000000000000001 /* RemoteModels.swift */; }; B20100000000000000000002 /* RemoteConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = B20200000000000000000002 /* RemoteConfig.swift */; }; B20100000000000000000003 /* CatalogStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B20200000000000000000003 /* CatalogStore.swift */; }; @@ -49,6 +50,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + B20A00000000000000000003 /* Textual in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -135,6 +137,9 @@ dependencies = ( ); name = PipperRemote; + packageProductDependencies = ( + B20A00000000000000000002 /* Textual */, + ); productName = PipperRemote; productReference = B20200000000000000000101 /* PipperRemote.app */; productType = "com.apple.product-type.application"; @@ -162,6 +167,9 @@ Base, ); mainGroup = B20400000000000000000010; + packageReferences = ( + B20A00000000000000000001 /* XCRemoteSwiftPackageReference "textual" */, + ); preferredProjectObjectVersion = 77; productRefGroup = B20400000000000000000011 /* Products */; projectDirPath = ""; @@ -289,6 +297,7 @@ buildSettings = { ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; "CODE_SIGNING_ALLOWED[sdk=iphonesimulator*]" = NO; + "LD_ENTITLEMENTS_SECTION[sdk=iphonesimulator*]" = "$(SRCROOT)/App/Simulator.entitlements"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = YSB9XBNUFD; @@ -313,6 +322,7 @@ buildSettings = { ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; "CODE_SIGNING_ALLOWED[sdk=iphonesimulator*]" = NO; + "LD_ENTITLEMENTS_SECTION[sdk=iphonesimulator*]" = "$(SRCROOT)/App/Simulator.entitlements"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = YSB9XBNUFD; @@ -354,6 +364,24 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ +/* Begin XCRemoteSwiftPackageReference section */ + B20A00000000000000000001 /* XCRemoteSwiftPackageReference "textual" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/gonzalezreal/textual"; + requirement = { + kind = upToNextMinorVersion; + minimumVersion = 0.5.0; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + B20A00000000000000000002 /* Textual */ = { + isa = XCSwiftPackageProductDependency; + package = B20A00000000000000000001 /* XCRemoteSwiftPackageReference "textual" */; + productName = Textual; + }; +/* End XCSwiftPackageProductDependency section */ }; rootObject = B20700000000000000000001 /* Project object */; } diff --git a/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteClient.swift b/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteClient.swift index d983f3d..4e09998 100644 --- a/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteClient.swift +++ b/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteClient.swift @@ -85,22 +85,43 @@ public struct RemoteClient: Sendable { return b.report } - /// `agentId` maps to the laptop's `modelId` field (it is an agent id there). - public func createThread(projectId: String, agentId: String?, prompt: String, requestId: String) async throws - -> RemoteThreadSummary - { + /// Models inside each agent, keyed by agent instance id. The Mac may spawn + /// agents to answer, so this gets a longer timeout than other routes. + public func agentModels() async throws -> [String: [RemoteAgentModel]] { + struct Body: Decodable { var models: [String: [RemoteAgentModel]] } + var req = try request("/api/remote/agent-models", method: "GET", body: nil) + req.timeoutInterval = 30 + let b: Body = try await perform(req) + return b.models + } + + /// `agentId` maps to the laptop's `modelId` field (it is an agent id there); + /// `model` is the model inside that agent, nil for the agent's default. + public func createThread( + projectId: String, agentId: String?, model: String? = nil, prompt: String, requestId: String + ) async throws -> RemoteThreadSummary { struct Input: Encodable { var requestId: String var projectId: String var modelId: String? + var model: String? var prompt: String } struct Body: Decodable { var thread: RemoteThreadSummary } let b: Body = try await post( - "/api/remote/threads", Input(requestId: requestId, projectId: projectId, modelId: agentId, prompt: prompt)) + "/api/remote/threads", + Input(requestId: requestId, projectId: projectId, modelId: agentId, model: model, prompt: prompt)) return b.thread } + /// Switches the model for the thread's next turn. + public func setModel(threadId: String, model: String) async throws -> RemoteThreadModel? { + struct Input: Encodable { var model: String } + struct Body: Decodable { var model: RemoteThreadModel? } + let b: Body = try await post("/api/remote/threads/\(encode(threadId))/model", Input(model: model)) + return b.model + } + public func sendPrompt(threadId: String, prompt: String, requestId: String) async throws { struct Input: Encodable { var requestId: String; var prompt: String } struct Body: Decodable { var ok: Bool } diff --git a/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteModels.swift b/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteModels.swift index 3da1f1b..3f8a93c 100644 --- a/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteModels.swift +++ b/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteModels.swift @@ -97,6 +97,33 @@ public struct RemoteCatalog: Codable, Equatable, Sendable { } } +/// A model offered inside one agent (the ACP session's model option), from +/// `GET /api/remote/agent-models`. +public struct RemoteAgentModel: Codable, Hashable, Sendable, Identifiable { + public var id: String + public var name: String + + public init(id: String, name: String) { + self.id = id + self.name = name + } +} + +/// A thread's current model and what it can switch to. +public struct RemoteThreadModel: Codable, Equatable, Sendable { + public var current: String? + public var options: [RemoteAgentModel] + + public init(current: String?, options: [RemoteAgentModel]) { + self.current = current + self.options = options + } + + public var currentName: String? { + current.map { id in options.first { $0.id == id }?.name ?? id } + } +} + public struct RemoteThreadSummary: Codable, Hashable, Sendable, Identifiable { public var id: String public var projectId: String @@ -145,6 +172,8 @@ public struct RemoteReport: Codable, Equatable, Sendable { public var isolationNote: String? public var permissions: [RemotePermission]? public var request: RemoteRequestStatus? + /// Nil on older Macs, for threads not loaded on the Mac, or agents with no model choice. + public var model: RemoteThreadModel? } public struct RemotePermission: Codable, Equatable, Sendable, Identifiable { diff --git a/native/pipper-remote-ios/Tests/PipperRemoteCoreTests/PipperRemoteCoreTests.swift b/native/pipper-remote-ios/Tests/PipperRemoteCoreTests/PipperRemoteCoreTests.swift index 856775b..37a52e9 100644 --- a/native/pipper-remote-ios/Tests/PipperRemoteCoreTests/PipperRemoteCoreTests.swift +++ b/native/pipper-remote-ios/Tests/PipperRemoteCoreTests/PipperRemoteCoreTests.swift @@ -182,6 +182,35 @@ struct RemoteClientTests { #expect(body?["prompt"] as? String == "Fix login") } + @Test func modelChoiceTravelsSeparatelyFromAgent() async throws { + let client = stubClient { _ in + (201, json(["thread": ["id": "t1", "projectId": "p1", "running": true, "lastUsedAt": 0]])) + } + _ = try await client.createThread(projectId: "p1", agentId: "codex-acp", prompt: "Fix", requestId: "r1") + var body = try JSONSerialization.jsonObject(with: StubURLProtocol.lastBody ?? Data()) as? [String: Any] + #expect(body?["model"] == nil) + _ = try await client.createThread( + projectId: "p1", agentId: "codex-acp", model: "gpt-5", prompt: "Fix", requestId: "r2") + body = try JSONSerialization.jsonObject(with: StubURLProtocol.lastBody ?? Data()) as? [String: Any] + #expect(body?["modelId"] as? String == "codex-acp") + #expect(body?["model"] as? String == "gpt-5") + } + + @Test func listsAndSwitchesModels() async throws { + let client = stubClient { req in + if req.httpMethod == "GET" { + return (200, json(["models": ["codex-acp": [["id": "gpt-5", "name": "GPT-5"]]]])) + } + return (200, json(["model": ["current": "o3", "options": [["id": "gpt-5", "name": "GPT-5"], ["id": "o3", "name": "o3"]]]])) + } + let models = try await client.agentModels() + #expect(StubURLProtocol.lastRequest?.url?.path == "/api/remote/agent-models") + #expect(models["codex-acp"]?.first?.name == "GPT-5") + let updated = try await client.setModel(threadId: "t1", model: "o3") + #expect(StubURLProtocol.lastRequest?.url?.path == "/api/remote/threads/t1/model") + #expect(updated?.currentName == "o3") + } + @Test func unauthorizedSurfacesPairingError() async { let client = stubClient { _ in (401, json(["error": "Unauthorized"])) } do { @@ -226,6 +255,8 @@ struct RemoteClientTests { #expect(r.messages[1].role == .agent) #expect(r.isolated == false) #expect(r.worktreePath == nil) + // Older Macs omit `model`. + #expect(r.model == nil) } @Test func followupCarriesStableRequestIdAndAcceptsImmediateAcknowledgement() async throws { let client = stubClient { request in diff --git a/native/pipper-remote-ios/scripts/sign-simulator.sh b/native/pipper-remote-ios/scripts/sign-simulator.sh index 039d084..9a40dbf 100755 --- a/native/pipper-remote-ios/scripts/sign-simulator.sh +++ b/native/pipper-remote-ios/scripts/sign-simulator.sh @@ -7,10 +7,13 @@ # development identity instead so linkd sees a Team ID. Device builds are # untouched: they are always team-signed. # -# Re-signing by hand also drops the entitlements Xcode would have generated, -# and the Keychain refuses every write without an application-identifier / -# keychain-access-groups (SecItemAdd returns errSecMissingEntitlement, -34018). -# Regenerate those before signing. +# The signature must carry no entitlements. The macOS host refuses to spawn a +# certificate-signed binary whose signature claims entitlements without a +# provisioning profile (launchd error 163 "Security policy issue", shown by +# Xcode as "No such process"), even just get-task-allow. The keychain +# entitlements the simulator needs are linked into the __TEXT,__entitlements +# section instead (LD_ENTITLEMENTS_SECTION -> App/Simulator.entitlements), +# which is where Xcode itself puts them for simulator builds. # # Xcode may still write Metadata.appintents after this phase (its ordering # against the SSU/NLU step is not declarable), which leaves the resource seal @@ -22,43 +25,12 @@ if [ "$PLATFORM_NAME" != "iphonesimulator" ]; then exit 0 fi -BUNDLE_ID=$(/usr/libexec/PlistBuddy -c "Print :CFBundleIdentifier" \ - "$CODESIGNING_FOLDER_PATH/Info.plist" 2>/dev/null || echo "com.maker-or.omni.remote") - -# Team prefix comes from the signing certificate so the keychain access group -# is valid; an ad-hoc build (no identity) falls back to a bare bundle id. -TEAM=$(security find-certificate -c "Apple Development" -p 2>/dev/null \ - | openssl x509 -noout -subject 2>/dev/null \ - | tr ',' '\n' | sed -n 's/^ *OU=//p' | head -1) -GROUP="${TEAM:+$TEAM.}$BUNDLE_ID" - -ENTITLEMENTS=$(mktemp) -trap 'rm -f "$ENTITLEMENTS"' EXIT -cat > "$ENTITLEMENTS" < - - - - application-identifier - $GROUP - keychain-access-groups - - $GROUP - - com.apple.developer.team-identifier - $TEAM - get-task-allow - - - -PLIST - IDENTITY=$(security find-identity -v -p codesigning 2>/dev/null \ | grep -o '"Apple Development[^"]*"' | head -1 | tr -d '"') if [ -z "$IDENTITY" ]; then echo "warning: no 'Apple Development' identity in the keychain; App Intents entity parameters will fail on the simulator. Sign in to Xcode > Settings > Accounts once to create one." - codesign --force --deep --sign - --timestamp=none --entitlements "$ENTITLEMENTS" "$CODESIGNING_FOLDER_PATH" + codesign --force --deep --sign - --timestamp=none "$CODESIGNING_FOLDER_PATH" exit 0 fi echo "Signing simulator build with: $IDENTITY" -codesign --force --deep --sign "$IDENTITY" --timestamp=none --entitlements "$ENTITLEMENTS" "$CODESIGNING_FOLDER_PATH" +codesign --force --deep --sign "$IDENTITY" --timestamp=none "$CODESIGNING_FOLDER_PATH" From 81337291b306319a9ef188089f8a6fb748394be4 Mon Sep 17 00:00:00 2001 From: Harshith Pasupuleti Date: Tue, 6 Oct 2026 18:34:39 +0530 Subject: [PATCH 22/22] Pair the iOS app with the Cloudflare device pairing The iOS app still used the shared Tailscale token, which the laptop no longer accepts. It now pairs the same way as the hosted phone app: - Parses the laptop's pairing QR/link. Hosted links name the laptop by its lt-*.pipper.dev host; laptop-served links work for quick tunnels and, over plain HTTP, only Tailscale/loopback addresses. - Never redeems a link on its own: previews the laptop, verifies pipper.dev's Ed25519 owner statement for that exact host, and asks the user to confirm before redeeming the one-time code. - Stores this phone's own device token in the Keychain and the laptop's address and verified owner in defaults. - Unpair revokes the token on the Mac; a 401 (revoked or expired) sends the app back to pairing with a notice. - Deletes the old shared-token pairing on launch and asks to pair again. - Drops the hard-coded DEBUG Tailscale pairing. Co-Authored-By: Claude Opus 5.5 --- native/pipper-remote-ios/App/Info.plist | 6 +- .../App/Intents/StartThreadIntent.swift | 6 +- .../pipper-remote-ios/App/RemoteSession.swift | 116 +++++--- .../App/Views/PairingView.swift | 241 ++++++++++------ .../App/Views/SettingsView.swift | 37 ++- native/pipper-remote-ios/README.md | 64 +++-- .../PipperRemoteCore/RemoteClient.swift | 107 +++++-- .../PipperRemoteCore/RemoteConfig.swift | 270 ++++++++++++++---- .../PipperRemoteCore/RemoteModels.swift | 32 +++ .../PipperRemoteCoreTests.swift | 195 +++++++++++-- 10 files changed, 826 insertions(+), 248 deletions(-) diff --git a/native/pipper-remote-ios/App/Info.plist b/native/pipper-remote-ios/App/Info.plist index 2b838fa..f08cdc7 100644 --- a/native/pipper-remote-ios/App/Info.plist +++ b/native/pipper-remote-ios/App/Info.plist @@ -40,8 +40,10 @@ NSCameraUsageDescription Scan the pairing QR code shown by Pipper on your Mac. - + NSAppTransportSecurity NSAllowsArbitraryLoads diff --git a/native/pipper-remote-ios/App/Intents/StartThreadIntent.swift b/native/pipper-remote-ios/App/Intents/StartThreadIntent.swift index 2a85ee2..dbadbc8 100644 --- a/native/pipper-remote-ios/App/Intents/StartThreadIntent.swift +++ b/native/pipper-remote-ios/App/Intents/StartThreadIntent.swift @@ -10,7 +10,7 @@ enum StartThreadError: Error, CustomLocalizedStringResourceConvertible { var localizedStringResource: LocalizedStringResource { switch self { case .notPaired: - return "Pipper isn't paired with your Mac yet. Open the app and scan the pairing code." + return "Pipper isn't paired with your Mac. Open the app and scan the pairing code from your Mac's Settings → Remote." case .noAgent: return "No agent is installed on your Mac. Pick one in Pipper on the Mac first." case .agentUnavailable(let name): @@ -23,7 +23,7 @@ enum StartThreadError: Error, CustomLocalizedStringResourceConvertible { /// Siri-first entry point: "Start a Pipper thread in FolkLore with Codex". /// Runs in the app process in the background (no app launch), POSTs to the -/// laptop over Tailscale, and speaks the result. +/// laptop (through its Pipper tunnel), and speaks the result. struct StartThreadIntent: AppIntent { static var title: LocalizedStringResource = "Start Pipper thread" static var description = IntentDescription( @@ -91,7 +91,7 @@ struct StartThreadIntent: AppIntent { struct CheckMacIntent: AppIntent { static var title: LocalizedStringResource = "Check Pipper Mac" static var description = IntentDescription( - "Checks whether your Mac is reachable over Tailscale and how many threads are running.", + "Checks whether your Mac is reachable and how many threads are running.", categoryName: "Productivity") static var openAppWhenRun: Bool = false diff --git a/native/pipper-remote-ios/App/RemoteSession.swift b/native/pipper-remote-ios/App/RemoteSession.swift index e42baf5..e80abbe 100644 --- a/native/pipper-remote-ios/App/RemoteSession.swift +++ b/native/pipper-remote-ios/App/RemoteSession.swift @@ -1,6 +1,7 @@ import AppIntents import Foundation import Observation +import UIKit /// Process-wide state shared by the SwiftUI app and the in-process App /// Intents: pairing config, the cached catalog, and a client built from them. @@ -10,13 +11,21 @@ final class RemoteSession { static let shared = RemoteSession() private enum Keys { - static let host = "remote.host" - static let port = "remote.port" - static let token = "remote.token" + /// The paired laptop (address, name, owner) without its token. + static let laptop = "remote.laptop" + /// This phone's device token for that laptop. + static let deviceToken = "remote.deviceToken" static let lastSiriThreadId = "remote.lastSiriThreadId" + /// Before device pairing: one shared Tailscale token per laptop. The + /// laptop no longer accepts it, so it is only ever cleaned up. + static let legacyHost = "remote.host" + static let legacyPort = "remote.port" + static let legacyToken = "remote.token" } private(set) var config: RemoteConfig? + /// Why the phone is back on the pairing screen (revoked, or an old pairing). + private(set) var pairNotice: String? private(set) var catalog: RemoteCatalog private(set) var catalogError: String? private(set) var lastCatalogRefresh: Date? @@ -32,14 +41,6 @@ final class RemoteSession { private let submissions = RemoteSubmissionStore() #if DEBUG private var isPreview = false - - /// Debug builds auto-pair to this Mac so testing skips the QR flow, but - /// only when nothing is stored: a real (re-)pairing always wins, so a stale - /// token here can't mask it. In memory only, nothing is persisted. - /// Never compiled into Release. - private static let devPairing: RemoteConfig? = RemoteConfig( - host: "100.82.38.10", port: 4173, - token: "3433463b635681a46d5d10019562a495e2a65cb202dd010f") #endif func createThread( @@ -48,7 +49,7 @@ final class RemoteSession { guard let client, let config else { throw RemoteClientError.notPaired } // `model` joins the scope only when set, keeping pending IDs from before // model choice stable. - let scope = [config.host, String(config.port), "create", projectId, agentId ?? ""] + let scope = [config.baseURL.absoluteString, "create", projectId, agentId ?? ""] + (model.map { ["model:\($0)"] } ?? []) + [prompt] let id = try submissions.requestId(for: scope) do { @@ -66,7 +67,7 @@ final class RemoteSession { func sendPrompt(threadId: String, prompt: String) async throws { guard let client, let config else { throw RemoteClientError.notPaired } - let scope = [config.host, String(config.port), "prompt", threadId, prompt] + let scope = [config.baseURL.absoluteString, "prompt", threadId, prompt] let id = try submissions.requestId(for: scope) do { try await client.sendPrompt(threadId: threadId, prompt: prompt, requestId: id) @@ -80,17 +81,27 @@ final class RemoteSession { private init() { let defaults = UserDefaults.standard lastSiriThreadId = defaults.string(forKey: Keys.lastSiriThreadId) - if let host = defaults.string(forKey: Keys.host), !host.isEmpty, - let token = Keychain.read(Keys.token), !token.isEmpty + if let data = defaults.data(forKey: Keys.laptop), + var stored = try? JSONDecoder().decode(RemoteConfig.self, from: data), + let token = Keychain.read(Keys.deviceToken), !token.isEmpty { - let port = defaults.integer(forKey: Keys.port) - config = RemoteConfig(host: host, port: port == 0 ? RemoteConfig.defaultPort : port, token: token) + stored.token = token + config = stored } catalog = catalogStore.load() ?? .empty lastCatalogRefresh = catalogStore.modifiedAt - #if DEBUG - if config == nil, let devPairing = Self.devPairing { config = devPairing } - #endif + if defaults.string(forKey: Keys.legacyHost) != nil || Keychain.read(Keys.legacyToken) != nil { + defaults.removeObject(forKey: Keys.legacyHost) + defaults.removeObject(forKey: Keys.legacyPort) + Keychain.delete(Keys.legacyToken) + if config == nil { + catalogStore.clear() + catalog = .empty + lastCatalogRefresh = nil + pairNotice = + "Pipper now pairs each phone with a one-time code. On your Mac, open Settings → Remote → Pair a phone, then scan the new QR." + } + } } #if DEBUG @@ -99,7 +110,12 @@ final class RemoteSession { /// config, while `client` remains nil so previews never make network requests. init(previewCatalog: RemoteCatalog, paired: Bool = false, agentModels: [String: [RemoteAgentModel]] = [:]) { self.agentModels = agentModels - config = paired ? RemoteConfig(host: "preview.invalid", port: RemoteConfig.defaultPort, token: "preview") : nil + config = + paired + ? RemoteConfig( + baseURL: URL(string: "https://lt-preview.pipper.dev")!, token: "preview", laptopName: "Studio", + owner: LaptopOwner(sub: "preview", email: "me@example.com", name: nil)) + : nil catalog = previewCatalog catalogError = nil lastCatalogRefresh = nil @@ -122,29 +138,59 @@ final class RemoteSession { if isPreview { return nil } #endif guard let config, config.isComplete else { return nil } - return RemoteClient(config: config) + let token = config.token + return RemoteClient(config: config) { + // The laptop revoked this phone (or its access expired). Only drop the + // pairing that was refused, not one made since the request started. + Task { @MainActor in + let session = RemoteSession.shared + guard session.config?.token == token else { return } + session.forget(notice: "Your Mac removed this phone, or its access expired. Pair again to use it.") + } + } } - /// Persist a pairing after `health()` succeeded. Token goes to the Keychain, - /// host/port to defaults. - func pair(_ next: RemoteConfig) throws { - try Keychain.write(Keys.token, value: next.token) - let defaults = UserDefaults.standard - defaults.set(next.host, forKey: Keys.host) - defaults.set(next.port, forKey: Keys.port) + /// Name this phone gets in the laptop's device list. + static var deviceName: String { "\(UIDevice.current.model) · Pipper app" } + + /// Redeem a confirmed pairing link and keep this phone's device token. + /// The token goes to the Keychain; the laptop's address and owner to defaults. + func pair(_ link: PairingLink, owner: LaptopOwner?) async throws { + let paired = try await RemoteClient.redeemPairing(link, deviceName: Self.deviceName) + let next = RemoteConfig( + baseURL: link.baseURL, token: paired.token, laptopName: paired.laptop?.name, owner: owner, + deviceName: paired.device.name) + try Keychain.write(Keys.deviceToken, value: next.token) + var stored = next + stored.token = "" + UserDefaults.standard.set(try JSONEncoder().encode(stored), forKey: Keys.laptop) + if config?.baseURL != next.baseURL { clearCatalog() } config = next + pairNotice = nil + await refreshCatalog() } - func unpair() { - let defaults = UserDefaults.standard - defaults.removeObject(forKey: Keys.host) - defaults.removeObject(forKey: Keys.port) + /// Unpair from Settings: revoke on the laptop first (best effort), so the + /// token is dead even if it leaked, then forget it here. + func unpair() async { + try? await client?.revokeThisDevice() + forget(notice: nil) + } + + private func forget(notice: String?) { + UserDefaults.standard.removeObject(forKey: Keys.laptop) + Keychain.delete(Keys.deviceToken) lastSiriThreadId = nil - Keychain.delete(Keys.token) - catalogStore.clear() + clearCatalog() config = nil + pairNotice = notice + } + + private func clearCatalog() { + catalogStore.clear() catalog = .empty lastCatalogRefresh = nil + agentModels = [:] Task { PipperRemoteShortcuts.updateAppShortcutParameters() } } diff --git a/native/pipper-remote-ios/App/Views/PairingView.swift b/native/pipper-remote-ios/App/Views/PairingView.swift index 47c9bee..bb4394d 100644 --- a/native/pipper-remote-ios/App/Views/PairingView.swift +++ b/native/pipper-remote-ios/App/Views/PairingView.swift @@ -1,33 +1,29 @@ import SwiftUI -/// Pair with the laptop: scan the QR from Pipper → Settings → Remote access -/// (or the terminal), or type the Tailscale host + token by hand. +/// Pair with the laptop: scan the QR from Pipper → Settings → Remote → Pair a +/// phone, or paste its pairing link (or type the address and code). Either +/// way the laptop is shown for confirmation before the code is redeemed. struct PairingView: View { @Environment(RemoteSession.self) private var session - @State private var host = "" - @State private var port = String(RemoteConfig.defaultPort) - @State private var token = "" + @State private var address = "" + @State private var code = "" @State private var scanning = false - @State private var testing = false @State private var error: String? - /// A pairing config offered by an incoming deep link, held until the user - /// confirms it. Custom URL schemes can be opened by any app or web page, so - /// a link must never pair silently. - @State private var pendingPairing: RemoteConfig? + /// A pairing link held until the user confirms it. Links, scans, and the + /// custom URL scheme can come from anyone, so nothing pairs silently. + @State private var pending: PairingLink? - /// The host field tolerates `host:port` or a pasted URL; the port/token - /// fields win only when the host field carried none. - private var draft: RemoteConfig { - let parsed = PairingURL.parseHostInput(host) - return RemoteConfig( - host: parsed?.host ?? "", - port: parsed?.port ?? Int(port) ?? RemoteConfig.defaultPort, - token: parsed?.token ?? token) - } + private var manual: PairingLink? { PairingLink.manual(address: address, code: code) } var body: some View { NavigationStack { Form { + if let notice = session.pairNotice { + Section { + Label(notice, systemImage: "exclamationmark.triangle") + .foregroundStyle(.orange) + } + } Section { Button { scanning = true @@ -35,28 +31,25 @@ struct PairingView: View { Label("Scan pairing QR", systemImage: "qrcode.viewfinder") } } footer: { - Text("On the Mac: Pipper → Settings → Remote access. The phone must be on the same Tailscale network.") + Text("On your Mac: Pipper → Settings → Remote → Pair a phone.") } - Section("Or enter manually") { - TextField("Tailscale IP (100.x.x.x)", text: $host) - .keyboardType(.numbersAndPunctuation) + Section { + TextField("Pairing link or laptop address", text: $address) + .keyboardType(.URL) .textInputAutocapitalization(.never) .autocorrectionDisabled() - .onChange(of: host) { _, value in - // Pasted "host:port" or a full pairing URL: split it into the - // fields so what the user sees is what gets used. - guard let parsed = PairingURL.parseHostInput(value), - parsed.port != nil || parsed.token != nil - else { return } - host = parsed.host - if let p = parsed.port { port = String(p) } - if let t = parsed.token { token = t } + .onChange(of: address) { _, value in + // A pasted pairing link carries its own code: show it. + if let link = PairingLink.parse(value) { code = link.code } } - TextField("Port", text: $port) - .keyboardType(.numberPad) - SecureField("Pairing token", text: $token) - .textInputAutocapitalization(.never) + TextField("Code (XXXXX-XXXXX)", text: $code) + .textInputAutocapitalization(.characters) .autocorrectionDisabled() + .textContentType(.oneTimeCode) + } header: { + Text("Or enter manually") + } footer: { + Text("Paste the pairing link from your Mac, or type its address (lt-….pipper.dev) and the code shown under the QR.") } if let error { Section { @@ -64,79 +57,150 @@ struct PairingView: View { } } Section { - Button { - Task { await pair(draft) } - } label: { - if testing { - ProgressView() - } else { - Text("Pair") - } + Button("Continue") { + error = nil + pending = manual } - .disabled(!draft.isComplete || testing) + .disabled(manual == nil) } } .navigationTitle("Pair with your Mac") .sheet(isPresented: $scanning) { QRScannerSheet { text in scanning = false - if let cfg = PairingURL.parse(text) { - host = cfg.host - port = String(cfg.port) - token = cfg.token - Task { await pair(cfg) } - } else if PairingURL.isBareToken(text) { - token = text.trimmingCharacters(in: .whitespacesAndNewlines) + if let link = PairingLink.parse(text) { + error = nil + pending = link } else { - error = "That QR isn't a Pipper pairing code." + error = "That QR isn't a Pipper pairing code. Make a new one on your Mac: Settings → Remote → Pair a phone." } } } + .sheet(item: $pending) { link in + ConfirmPairingView(link: link) + } .onOpenURL { url in - // pipper-remote://pair?url= — lets a future - // desktop "Send to phone" open the app directly. Any app or web page - // can trigger this scheme, so never pair on the link's say-so: surface - // the target and require an explicit confirmation. + // pipper-remote://pair?url= — still only offers + // the laptop for confirmation. guard let items = URLComponents(url: url, resolvingAgainstBaseURL: false)?.queryItems, let raw = items.first(where: { $0.name == "url" })?.value, - let cfg = PairingURL.parse(raw) + let link = PairingLink.parse(raw) else { return } - pendingPairing = cfg + pending = link + } + } + } +} + +/// Who the laptop is, before this phone redeems the code: a pairing link +/// could point at anyone's laptop, and pairing makes it the destination for +/// every task sent from this phone. +struct ConfirmPairingView: View { + let link: PairingLink + @Environment(RemoteSession.self) private var session + @Environment(\.dismiss) private var dismiss + @State private var laptop: RemoteLaptopIdentity? + /// Nil when the laptop isn't on a named tunnel, so no owner can be checked. + @State private var owner: LaptopAttestation.Check? + @State private var error: String? + @State private var pairing = false + + var body: some View { + NavigationStack { + Form { + Section { + if let laptop { + LabeledContent("Laptop", value: laptop.name) + LabeledContent("Address", value: link.host) + ownerRow + } else if error == nil { + HStack { + ProgressView() + Text("Checking the laptop…").foregroundStyle(.secondary) + } + } + } footer: { + Text("After pairing, the tasks you send from this phone and Siri go to this laptop.") + } + if let error { + Section { + Text(error).foregroundStyle(.red) + } + } + Section { + Button { + Task { await pair() } + } label: { + if pairing { + ProgressView() + } else { + Text("Pair with \(laptop?.name ?? "this laptop")") + } + } + .disabled(laptop == nil || pairing) + } } - .alert( - "Pair with this Mac?", - isPresented: Binding( - get: { pendingPairing != nil }, - set: { if !$0 { pendingPairing = nil } } - ), - presenting: pendingPairing - ) { cfg in - Button("Pair") { - pendingPairing = nil - Task { await pair(cfg) } + .navigationTitle("Pair with this laptop?") + .navigationBarTitleDisplayMode(.inline) + .toolbar { + ToolbarItem(placement: .cancellationAction) { + Button("Cancel") { dismiss() } + .disabled(pairing) } - Button("Cancel", role: .cancel) { pendingPairing = nil } - } message: { cfg in - Text( - "A link wants to pair Pipper with \(cfg.host):\(cfg.port). Only continue if you started this pairing." - ) } + .task { await load() } } + .interactiveDismissDisabled(pairing) } - private func pair(_ cfg: RemoteConfig) async { - guard !testing else { return } - error = nil - testing = true - defer { testing = false } + @ViewBuilder private var ownerRow: some View { + switch owner { + case .verified(let who): + Label("Belongs to \(who.label) — verified by Pipper", systemImage: "checkmark.seal.fill") + .foregroundStyle(.green) + case .unverified(let reason): + Label( + "Unverified: \(reason) Pair only if you just made this code on your own Mac.", + systemImage: "exclamationmark.triangle.fill" + ) + .foregroundStyle(.orange) + case nil: + Label( + "This laptop isn't on Pipper's network, so its owner can't be checked. Pair only if you just made this code on your own Mac.", + systemImage: "exclamationmark.triangle" + ) + .foregroundStyle(.secondary) + } + } + + private func load() async { + #if DEBUG + if session.client == nil, link.host.hasPrefix("lt-preview") { + laptop = RemoteLaptopIdentity(name: "Studio", host: link.host, attestation: nil) + owner = .verified(LaptopOwner(sub: "preview", email: "me@example.com", name: nil)) + return + } + #endif do { - let diagnostics = try await RemoteClient(config: cfg).diagnostics() - guard diagnostics.paired else { - error = "The Mac answered, but not as Pipper." - return + let identity = try await RemoteClient.previewPairing(link) + if link.isNamedTunnel { + owner = LaptopAttestation.verify(identity.attestation, host: link.host) } - try session.pair(cfg) - await session.refreshCatalog() + laptop = identity + } catch { + self.error = error.localizedDescription + } + } + + private func pair() async { + guard !pairing else { return } + pairing = true + error = nil + defer { pairing = false } + let verified: LaptopOwner? = if case .verified(let who) = owner { who } else { nil } + do { + try await session.pair(link, owner: verified) + dismiss() } catch { self.error = error.localizedDescription } @@ -148,4 +212,9 @@ struct PairingView: View { PairingView() .environment(RemoteSession.preview()) } + +#Preview("Confirm") { + ConfirmPairingView(link: PairingLink(code: "ABCDE12345", baseURL: URL(string: "https://lt-preview.pipper.dev")!)!) + .environment(RemoteSession.preview()) +} #endif diff --git a/native/pipper-remote-ios/App/Views/SettingsView.swift b/native/pipper-remote-ios/App/Views/SettingsView.swift index f44b8b8..dc19e05 100644 --- a/native/pipper-remote-ios/App/Views/SettingsView.swift +++ b/native/pipper-remote-ios/App/Views/SettingsView.swift @@ -5,6 +5,7 @@ struct SettingsView: View { @Environment(RemoteSession.self) private var session @Environment(\.dismiss) private var dismiss @State private var refreshing = false + @State private var unpairing = false /// Shown as a tab rather than a sheet, so there's nothing to dismiss. var inTab = false @@ -12,8 +13,15 @@ struct SettingsView: View { NavigationStack { Form { Section("Mac") { - LabeledContent("Host", value: session.config?.host ?? "—") - LabeledContent("Port", value: session.config.map { String($0.port) } ?? "—") + LabeledContent("Name", value: session.config?.laptopName ?? "—") + LabeledContent("Address", value: session.config?.address ?? "—") + if let owner = session.config?.owner { + Label("Belongs to \(owner.label) — verified by Pipper", systemImage: "checkmark.seal.fill") + .foregroundStyle(.green) + } + if let device = session.config?.deviceName { + LabeledContent("This phone", value: device) + } } ConnectionCheckView() Section { @@ -70,10 +78,23 @@ struct SettingsView: View { .foregroundStyle(.secondary) } Section { - Button("Unpair", role: .destructive) { - session.unpair() - dismiss() + Button(role: .destructive) { + Task { + unpairing = true + await session.unpair() + unpairing = false + dismiss() + } + } label: { + HStack { + Text("Unpair") + Spacer() + if unpairing { ProgressView() } + } } + .disabled(unpairing) + } footer: { + Text("Removes this phone from your Mac too, so its access ends everywhere.") } } .navigationTitle("Settings") @@ -122,7 +143,7 @@ struct ConnectionCheckView: View { .font(.footnote).foregroundStyle(.orange) } else if let error { Text(error).font(.footnote).foregroundStyle(.red) - Text("Keep Pipper open on the Mac and connect both devices to the same Tailscale network.") + Text("Keep Pipper open on your Mac. If you changed how it connects in Settings → Remote, pair this phone again.") .font(.footnote).foregroundStyle(.secondary) } if let diagnostics { @@ -152,8 +173,8 @@ struct ConnectionCheckView: View { checkedAt = Date() await session.refreshCatalog() } catch RemoteClientError.http(status: 404, _) { - // Older Macs lack diagnostics, and health needs no token, so - // confirm the pairing against an endpoint every version serves. + // Older Macs lack diagnostics; confirm the pairing against an + // endpoint every version serves. do { _ = try await client.listThreads() macOutdated = true diff --git a/native/pipper-remote-ios/README.md b/native/pipper-remote-ios/README.md index 6759353..474ab99 100644 --- a/native/pipper-remote-ios/README.md +++ b/native/pipper-remote-ios/README.md @@ -1,8 +1,10 @@ # PipperRemote (iOS, Siri-first) Native SwiftUI companion that talks to the laptop's `RemoteServer` -(`electron/remote-server.ts`) over Tailscale — the same HTTP + bearer-token -surface the phone PWA uses. Its reason to exist is Siri: +(`electron/remote-server.ts`) through the laptop's Pipper tunnel +(`https://lt-….pipper.dev`, see `docs/remote-access.md`) — the same API, +device pairing, and per-phone tokens as the hosted phone app. Its reason to +exist is Siri: > "Start a Pipper thread in FolkLore" → Siri asks "What should the thread > work on?" → the laptop creates a `phone-xxxx` worktree + thread and runs the @@ -26,9 +28,11 @@ learns new project names. ## Layout -- `Sources/PipperRemoteCore/` — Foundation-only: wire models, `RemoteConfig`, - `PairingURL` (parses the laptop QR `http://100.x:4173/remote#token=…`), - `CatalogStore`, `RemoteClient`. `swift test` runs here on the Mac. +- `Sources/PipperRemoteCore/` — Foundation-only: wire models, `RemoteConfig` + (the paired laptop + this phone's token), `PairingLink` (parses the + laptop's pairing QR/link), `LaptopAttestation` (checks pipper.dev's signed + owner statement), `CatalogStore`, `RemoteClient`. `swift test` runs here on + the Mac. - `App/` — SwiftUI app, `RemoteSession` (pairing in Keychain + defaults, catalog), and `Intents/` (`StartThreadIntent`, `CheckMacIntent`, entities, `PipperRemoteShortcuts` phrases). @@ -43,9 +47,10 @@ learns new project names. `com.maker-or.omni.remote` is taken on your team. 2. Run on the phone. Free provisioning profiles expire after 7 days — re-run from Xcode to renew. -3. Install Tailscale on the phone and join the Mac's tailnet. -4. Pair: scan the QR from Pipper → Settings → Remote access, or type the - three fields printed by `bun run dev` under `[Remote] iOS app → Pair`. +3. On the Mac, choose the Cloudflare connection in Pipper → Settings → Remote + (sign in to pipper.dev once so the laptop gets its `lt-…` address). +4. Pair: Settings → Remote → Pair a phone, then in the app tap **Scan pairing + QR**. The app shows the laptop's name and verified owner; confirm to pair. 5. Say "Start a Pipper thread in ". First-time phrase indexing can take a minute after install. @@ -56,7 +61,9 @@ native/pipper-remote-ios/scripts/run-simulator.sh # iPhone 17 Pro native/pipper-remote-ios/scripts/run-simulator.sh "iPhone 17" ``` -Then pair manually (the simulator has no camera) and test the intent from +Then pair manually (the simulator has no camera): copy the pairing link from +the Mac's Settings → Remote and paste it into **Pairing link or laptop +address**, or type the `lt-….pipper.dev` address and the code. Test the intent from **Shortcuts → + → "Start Pipper thread"**. **Why the project re-signs simulator builds.** Xcode ad-hoc signs every @@ -72,7 +79,9 @@ produce a working build. You need to be signed in to Xcode → Settings → Accounts once so that identity exists. Never pass `CODE_SIGNING_ALLOWED=NO` on the command line: it also disables the re-sign phase. -Core tests (no simulator needed): `cd native/pipper-remote-ios && swift test`. +Core tests (no simulator needed): `cd native/pipper-remote-ios && xcrun swift test` +(`xcrun` picks Xcode's toolchain, which has CryptoKit; a standalone +swift.org toolchain does not). ## Phrases @@ -87,17 +96,36 @@ Siri always asks for the task (it is a required `String`). When no agent is named, `perform()` uses the Mac's default agent from the catalog, falling back to the first available one. -## Threat model - -Plain HTTP on purpose, exactly like the PWA: the laptop only binds loopback + -Tailscale, so the bearer token only ever crosses the WireGuard tailnet. ATS is -opened (`NSAllowsArbitraryLoads`) for that reason. The token lives in the -Keychain with `AfterFirstUnlock` so Siri works from the lock screen. +## Pairing and threat model + +Pairing follows the hosted phone app (`docs/remote-access.md`): + +1. The Mac shows a one-time code as a QR/link: + `https://remote.pipper.dev/#pair=CODE&host=lt-….pipper.dev`. + The app only ever talks to `host`, and only when it is an `lt-*` host + under pipper.dev (the zone locks those down as API-only). Laptop-served + links (`/remote#pair=CODE`) work for quick tunnels + (`*.trycloudflare.com`) and, over plain HTTP, Tailscale/loopback only. +2. Nothing is redeemed on the link's say-so. The app asks the laptop to + describe itself (`POST /api/remote/pair/preview`, which doesn't use the + code up), verifies pipper.dev's Ed25519 owner statement for that exact + host with the built-in public key (`LaptopAttestation.pipperPublicKey`, + same as `vite.remote-web.config.ts`; rotate both together), and shows + "Belongs to … — verified by Pipper" or an **Unverified** warning. +3. On confirm, `POST /api/remote/pair` returns this phone's own token. It + lives in the Keychain (`AfterFirstUnlock`, so Siri works from the lock + screen); the laptop address and owner live in defaults. +4. Unpair revokes the token on the Mac (`DELETE /api/remote/session`). If + the Mac revokes the phone instead, the next request gets a 401 and the + app returns to pairing with a notice. + +Builds before device pairing stored one shared Tailscale token; the Mac no +longer accepts it, so the app deletes it on launch and asks to pair again. ## Remote controls and recovery -Update the desktop and phone app together: thread creation and follow-ups now -require a `requestId`. The phone retains an unacknowledged ID across retries and +Thread creation and follow-ups carry a `requestId` (the Mac still accepts +older phones without one, just without retry de-duplication). The phone retains an unacknowledged ID across retries and app restarts; Pipper records it before creating a worktree or dispatching a prompt. Follow-ups are acknowledged immediately. If Pipper restarts during an uncertain dispatch, the existing request is shown as interrupted and is never diff --git a/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteClient.swift b/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteClient.swift index 4e09998..5b11305 100644 --- a/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteClient.swift +++ b/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteClient.swift @@ -13,10 +13,14 @@ public enum RemoteClientError: Error, LocalizedError, Equatable { switch self { case .notPaired: return "Not paired with a Mac yet." case .badURL: return "The Mac address is invalid." - case .unreachable(let why): return "Couldn't reach your Mac (\(why)). Is Tailscale connected?" + case .unreachable(let why): + return "Couldn't reach your Mac (\(why)). Keep Pipper open on your Mac and check your connection." case .http(let status, let body): - if status == 401 { return "The Mac rejected the pairing token. Pair again." } + if status == 401 { return "Your Mac no longer accepts this phone. Pair again." } + if status == 429 { return "Too many attempts. Wait a minute and try again." } if status == 503 { return "The agent on your Mac isn't ready yet." } + // 403 explains itself (e.g. a read-only phone starting work). + if status == 403, !body.isEmpty { return body } let detail = body.trimmingCharacters(in: .whitespacesAndNewlines) return detail.isEmpty ? "Mac returned HTTP \(status)." : "Mac returned HTTP \(status): \(detail)" case .rejected(let message): return message @@ -25,23 +29,29 @@ public enum RemoteClientError: Error, LocalizedError, Equatable { } } -/// Thin async client for the laptop's `/api/remote/*` routes. Bearer token on -/// every call; short timeouts because Siri waits on `perform()`. +/// Thin async client for the laptop's `/api/remote/*` routes. This phone's +/// device token on every call; short timeouts because Siri waits on `perform()`. public struct RemoteClient: Sendable { public let config: RemoteConfig private let session: URLSession + /// Called when the laptop refuses this phone's token (revoked or expired). + private let onUnauthorized: (@Sendable () -> Void)? - public init(config: RemoteConfig, session: URLSession? = nil) { + public init( + config: RemoteConfig, session: URLSession? = nil, + onUnauthorized: (@Sendable () -> Void)? = nil + ) { self.config = config - if let session { - self.session = session - } else { - let c = URLSessionConfiguration.ephemeral - c.timeoutIntervalForRequest = 15 - c.timeoutIntervalForResource = 30 - c.waitsForConnectivity = false - self.session = URLSession(configuration: c) - } + self.session = session ?? Self.defaultSession() + self.onUnauthorized = onUnauthorized + } + + static func defaultSession() -> URLSession { + let c = URLSessionConfiguration.ephemeral + c.timeoutIntervalForRequest = 15 + c.timeoutIntervalForResource = 30 + c.waitsForConnectivity = false + return URLSession(configuration: c) } // MARK: Routes @@ -52,6 +62,19 @@ public struct RemoteClient: Sendable { return h.ok } + /// The laptop's view of this phone (name and scopes). + public func device() async throws -> RemoteDevice { + struct Body: Decodable { var device: RemoteDevice } + let b: Body = try await get("/api/remote/session") + return b.device + } + + /// Unpair on the laptop too, so the token is dead even if it leaked. + public func revokeThisDevice() async throws { + struct Body: Decodable { var ok: Bool } + let _: Body = try await perform(request("/api/remote/session", method: "DELETE", body: nil)) + } + public func diagnostics() async throws -> RemoteDiagnostics { try await get("/api/remote/diagnostics") } @@ -140,8 +163,8 @@ public struct RemoteClient: Sendable { } private func request(_ path: String, method: String, body: Data?) throws -> URLRequest { - guard config.isComplete, let base = config.baseURL, let url = URL(string: path, relativeTo: base) - else { throw config.token.isEmpty || config.host.isEmpty ? RemoteClientError.notPaired : .badURL } + guard config.isComplete else { throw RemoteClientError.notPaired } + guard let url = URL(string: path, relativeTo: config.baseURL) else { throw RemoteClientError.badURL } var req = URLRequest(url: url) req.httpMethod = method req.setValue("Bearer \(config.token)", forHTTPHeaderField: "Authorization") @@ -162,7 +185,59 @@ public struct RemoteClient: Sendable { private struct Rejection: Decodable { var error: String; var retryable: Bool? } + // MARK: Pairing (no token yet) + + /// Ask the laptop who it is without using the code up, so the user can + /// confirm before this phone sends it anything (pairing-link hijack defense). + public static func previewPairing( + _ link: PairingLink, session: URLSession? = nil + ) async throws -> RemoteLaptopIdentity { + struct Input: Encodable { var code: String } + struct Body: Decodable { var laptop: RemoteLaptopIdentity } + let b: Body = try await pairingCall( + "/api/remote/pair/preview", link: link, input: Input(code: link.code), session: session) + return b.laptop + } + + /// Redeem the one-time code for this phone's own device token. + public static func redeemPairing( + _ link: PairingLink, deviceName: String, session: URLSession? = nil + ) async throws -> RemotePairResponse { + struct Input: Encodable { var code: String; var deviceName: String } + return try await pairingCall( + "/api/remote/pair", link: link, input: Input(code: link.code, deviceName: deviceName), + session: session) + } + + private static func pairingCall( + _ path: String, link: PairingLink, input: I, session: URLSession? + ) async throws -> T { + guard let url = URL(string: path, relativeTo: link.baseURL) else { throw RemoteClientError.badURL } + var req = URLRequest(url: url) + req.httpMethod = "POST" + req.setValue("application/json", forHTTPHeaderField: "Content-Type") + req.setValue("application/json", forHTTPHeaderField: "Accept") + req.httpBody = try JSONEncoder().encode(input) + do { + return try await send(req, session: session ?? defaultSession()) + } catch RemoteClientError.http(status: 401, _) { + throw RemoteClientError.rejected("That code is wrong or has expired. Make a new one on your Mac.") + } catch RemoteClientError.http(status: 404, _) { + throw RemoteClientError.rejected( + "That Mac's Pipper is too old for this app. Update Pipper on your Mac, then pair again.") + } + } + private func perform(_ req: URLRequest) async throws -> T { + do { + return try await Self.send(req, session: session) + } catch RemoteClientError.http(status: 401, let body) { + onUnauthorized?() + throw RemoteClientError.http(status: 401, body: body) + } + } + + static func send(_ req: URLRequest, session: URLSession) async throws -> T { let data: Data let response: URLResponse do { diff --git a/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteConfig.swift b/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteConfig.swift index e7b8ddc..8dc74a4 100644 --- a/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteConfig.swift +++ b/native/pipper-remote-ios/Sources/PipperRemoteCore/RemoteConfig.swift @@ -1,74 +1,244 @@ +import CryptoKit import Foundation -/// Where the laptop is and how to authenticate. The host must be a Tailscale -/// (100.64/10) or loopback address — that is all the laptop's RemoteServer -/// binds, and the only place a bearer token may travel in cleartext. -public struct RemoteConfig: Codable, Equatable, Sendable { - public static let defaultPort = 4173 +/// Account that pipper.dev says owns a laptop (from its signed statement). +public struct LaptopOwner: Codable, Equatable, Sendable { + public var sub: String + public var email: String? + public var name: String? + + public init(sub: String, email: String?, name: String?) { + self.sub = sub + self.email = email + self.name = name + } - public var host: String - public var port: Int + public var label: String { email ?? name ?? "a Pipper account" } +} + +/// The paired laptop: where its `/api/remote/*` lives and this phone's own +/// device token (issued by the laptop for a one-time pairing code). +public struct RemoteConfig: Codable, Equatable, Sendable { + /// Origin of the laptop's API, e.g. `https://lt-ab12….pipper.dev`. + public var baseURL: URL public var token: String + /// What the laptop calls itself (unverified). + public var laptopName: String? + /// Owner verified at pairing time; nil when unverified. + public var owner: LaptopOwner? + /// The name this phone has in the laptop's device list. + public var deviceName: String? - public init(host: String, port: Int = RemoteConfig.defaultPort, token: String) { - self.host = host.trimmingCharacters(in: .whitespacesAndNewlines) - self.port = port + public init( + baseURL: URL, token: String, laptopName: String? = nil, owner: LaptopOwner? = nil, + deviceName: String? = nil + ) { + self.baseURL = baseURL self.token = token.trimmingCharacters(in: .whitespacesAndNewlines) + self.laptopName = laptopName + self.owner = owner + self.deviceName = deviceName } - public var baseURL: URL? { - var c = URLComponents() - c.scheme = "http" - c.host = host - c.port = port - return c.url + /// Host (and port, when not the scheme's default) for display and keys. + public var address: String { + guard let host = baseURL.host else { return baseURL.absoluteString } + return baseURL.port.map { "\(host):\($0)" } ?? host } - public var isComplete: Bool { - !host.isEmpty && !token.isEmpty && baseURL != nil + public var isComplete: Bool { !token.isEmpty && baseURL.host?.isEmpty == false } + + /// "MacBook Pro · me@example.com": verified owner when there is one. + public var label: String { + let name = laptopName ?? "Your Mac" + return owner.map { "\(name) · \($0.label)" } ?? name } } -public enum PairingURL { - /// Parses the laptop's pairing QR, `http://:/remote#token=`. - /// Returns nil for anything that is not that exact shape. - public static func parse(_ text: String) -> RemoteConfig? { +/// A pairing offer from the laptop's QR or link, before it is redeemed. The +/// laptop shows it in Settings → Remote as a one-time code plus a link: +/// - named tunnel (Cloudflare): `https://remote.pipper.dev/#pair=CODE&host=lt-….pipper.dev` +/// - laptop-served (quick tunnel or Tailscale): `/remote#pair=CODE` +public struct PairingLink: Equatable, Sendable, Identifiable { + /// Domain whose reserved `lt-*` hosts are Pipper laptop tunnels. + public static let laptopDomain = "pipper.dev" + /// Port the laptop listens on when reached directly (Tailscale). + public static let defaultLaptopPort = 4173 + + public var code: String + public var baseURL: URL + + public init?(code: String, baseURL: URL) { + let trimmed = code.trimmingCharacters(in: .whitespacesAndNewlines) + guard Self.isValidCode(trimmed), Self.isAllowedBase(baseURL) else { return nil } + self.code = trimmed + self.baseURL = baseURL + } + + public var id: String { "\(baseURL.absoluteString)#\(code)" } + + public var host: String { baseURL.host?.lowercased() ?? "" } + + /// Reached through Pipper's own network (a named Cloudflare tunnel), so + /// pipper.dev's signed owner statement can be checked for this host. + public var isNamedTunnel: Bool { baseURL.scheme == "https" && Self.isLaptopTunnelHost(host) } + + /// Parses a scanned QR or pasted pairing link. Nil for anything else. + public static func parse(_ text: String) -> PairingLink? { let trimmed = text.trimmingCharacters(in: .whitespacesAndNewlines) - guard let components = URLComponents(string: trimmed), - components.scheme == "http", - let host = components.host, !host.isEmpty + guard let components = URLComponents(string: trimmed), let fragment = components.fragment else { return nil } - let fragment = components.fragment ?? "" - guard let range = fragment.range(of: #"token=([A-Za-z0-9]+)"#, options: .regularExpression) + let params = fragmentParams(fragment) + guard let code = params["pair"] else { return nil } + if let host = params["host"] { + // Hosted-app link: the laptop is named by `host`, never by the page. + guard isLaptopTunnelHost(host), let base = URL(string: "https://\(host.lowercased())") + else { return nil } + return PairingLink(code: code, baseURL: base) + } + // Laptop-served link: the laptop is the page's own origin. + guard let base = origin(of: components) else { return nil } + return PairingLink(code: code, baseURL: base) + } + + /// Typed or pasted by hand: a full pairing link in `address` wins; + /// otherwise `address` names the laptop (`lt-….pipper.dev`, a Tailscale + /// IP, or a URL) and `code` is the one shown under the QR. + public static func manual(address: String, code: String) -> PairingLink? { + let text = address.trimmingCharacters(in: .whitespacesAndNewlines) + if let link = parse(text) { return link } + guard !text.isEmpty else { return nil } + let base: URL? + if text.contains("://") { + base = URLComponents(string: text).flatMap(origin(of:)) + } else { + let host = text.split(separator: "/", maxSplits: 1).first.map(String.init) ?? text + let bare = host.split(separator: ":", maxSplits: 1).first.map(String.init) ?? host + if isLaptopTunnelHost(bare) { + base = URL(string: "https://\(host.lowercased())") + } else { + base = URL(string: "http://\(host.contains(":") ? host : "\(host):\(defaultLaptopPort)")") + } + } + return base.flatMap { PairingLink(code: code, baseURL: $0) } + } + + // MARK: Rules + + static func isValidCode(_ code: String) -> Bool { + code.range(of: #"^[0-9A-Za-z-]{4,32}$"#, options: .regularExpression) != nil + } + + /// `lt-