@danypops/tickets 0.8.1 → 0.8.3

package/README.md

@@ -277,7 +277,7 @@ bun test                   # both packages
 ```
 
 Tests never hit real GitHub/GitLab/Jira/Atlassian: adapters take an
-injectable `fetchImpl`, and the daemon tests (`test/daemon/`) run the real
+injectable `fetchImpl`, and the daemon tests (`test/rpc/`, `test/sqlite/`, `test/process/`) run the real
 `@danypops/daemon-kit` `startDaemon()`/SQLite/HTTP stack against a scratch
 XDG root with a fake `IssueRepository`.
 

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@danypops/tickets",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "description": "Unified CLI, daemon, and TypeScript library for issue tracking across GitHub, GitLab, and Jira.",
   "type": "module",
   "license": "MIT",
   "bin": {
     "tickets": "./src/cli/index.ts",
-    "tickets-daemon": "./src/daemon/main.ts"
+    "tickets-daemon": "./src/process/main.ts"
   },
   "main": "./src/index.ts",
   "types": "./src/index.ts",
@@ -19,7 +19,7 @@
     "RESEARCH.md"
   ],
   "scripts": {
-    "daemon": "bun run src/daemon/main.ts",
+    "daemon": "bun run src/process/main.ts",
     "test": "bun test",
     "typecheck": "tsc --noEmit"
   },

package/src/{vehicle → agent-tools}/tickets-vehicle.ts

@@ -2,11 +2,11 @@
  * Every real ticket operation projected as its own VehicleRegistry entry,
  * one per TicketOperation, instead of pi-tickets' hand-rolled
  * `tickets(action=X)` mega-tool. Operation names are already dotted
- * (issue.list, focus.set, discover.fields, ...) in daemon/ops.ts -- Vehicle's
+ * (issue.list, focus.set, discover.fields, ...) in rpc/ops.ts -- Vehicle's
  * tool-name projection turns each into its own Pi tool (issue_list,
  * focus_set, discover_fields, ...) with zero renaming needed.
  *
- * Delegates every operation to daemon/server.ts's TICKET_OP_HANDLERS, the
+ * Delegates every operation to rpc/server.ts's TICKET_OP_HANDLERS, the
  * exact same implementation the existing /api/v1/ops dispatch calls -- this
  * is a projection/contract layer on top of the existing application logic,
  * not a second copy of it.
@@ -23,9 +23,9 @@ import {
   type VehicleEffect,
 } from "@danypops/vehicle-core";
 import { VehicleRegistry } from "@danypops/vehicle-server";
-import type { BackendCapabilities, TicketService } from "../application/service.js";
-import type { TicketOperation } from "../daemon/ops.js";
-import { TICKET_OP_HANDLERS, type TicketsAppDeps } from "../daemon/server.js";
+import type { BackendCapabilities, TicketService } from "../issue/service.js";
+import type { TicketOperation } from "../rpc/ops.js";
+import { TICKET_OP_HANDLERS, type TicketsAppDeps } from "../rpc/server.js";
 
 const OWNER = "tickets";
 

package/src/auth/device-flow.ts

@@ -11,7 +11,7 @@
  * URI/local callback server needed, ideal for a headless daemon. Jira/Atlassian
  * has no equivalent (see jira-oauth.ts, which uses Authorization Code instead).
  */
-import type { FetchLike } from "../adapters/http.js";
+import type { FetchLike } from "../http-client.js";
 
 export const DEVICE_GRANT_TYPE = "urn:ietf:params:oauth:grant-type:device_code";
 

package/src/auth/github-oauth.ts

@@ -4,7 +4,7 @@
  * Requires a GitHub OAuth App (or GitHub App) with the device flow enabled in
  * its settings; the client ID is public (no secret needed for this flow).
  */
-import type { FetchLike } from "../adapters/http.js";
+import type { FetchLike } from "../http-client.js";
 import { type DeviceFlowConfig, type DeviceFlowToken, type PollOptions, pollForToken, requestDeviceAuthorization } from "./device-flow.js";
 
 export const GITHUB_DEVICE_AUTHORIZATION_URL = "https://github.com/login/device/code";

package/src/auth/gitlab-oauth.ts

@@ -5,7 +5,7 @@
  * Requires a "non-confidential" GitLab OAuth application (no client secret
  * for this flow, same shape as GitHub's device flow / RFC 8628).
  */
-import type { FetchLike } from "../adapters/http.js";
+import type { FetchLike } from "../http-client.js";
 import { type DeviceFlowConfig, type DeviceFlowToken, type PollOptions, pollForToken, requestDeviceAuthorization } from "./device-flow.js";
 import type { DevicePrompt } from "./github-oauth.js";
 

package/src/auth/jira-oauth.ts

@@ -17,7 +17,7 @@
 import { randomBytes } from "node:crypto";
 import { createServer, type Server } from "node:http";
 import type { AddressInfo } from "node:net";
-import type { FetchLike } from "../adapters/http.js";
+import type { FetchLike } from "../http-client.js";
 
 export const ATLASSIAN_AUTHORIZE_URL = "https://auth.atlassian.com/authorize";
 export const ATLASSIAN_TOKEN_URL = "https://auth.atlassian.com/oauth/token";

package/src/cli/index.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 /**
  * The tickets CLI is a thin client of the tickets daemon: every command maps
- * 1:1 to a daemon RPC op (see daemon/ops.ts and daemon/server.ts), the same
+ * 1:1 to a daemon RPC op (see rpc/ops.ts and rpc/server.ts), the same
  * ops the pi-tickets extension calls. Nothing here opens the daemon's SQLite
  * ledger or a backend adapter directly.
  */
@@ -13,10 +13,10 @@ import { loginWithGitLabDeviceFlow } from "../auth/gitlab-oauth.js";
 import { loginWithJiraAuthorizationCode } from "../auth/jira-oauth.js";
 import { promptMaskedSecret } from "../auth/masked-prompt.js";
 import { deleteToken, isTokenFresh, listStoredBackends, loadToken, saveToken } from "../auth/token-store.js";
-import { createTicketsClient, type TicketsRpcClient } from "../client/tickets-client.js";
-import type { CreateInput, ListFilter, Priority, Status, UpdateInput } from "../domain/issue.js";
-import { parseStatus } from "../domain/issue.js";
+import type { CreateInput, ListFilter, Priority, Status, UpdateInput } from "../issue/issue.js";
+import { parseStatus } from "../issue/issue.js";
 import { installTicketsService, systemctlTickets, systemdUnitPath } from "./systemd-service.js";
+import { createTicketsClient, type TicketsRpcClient } from "./tickets-client.js";
 
 function printJson(value: unknown): void {
   process.stdout.write(`${JSON.stringify(value, null, 2)}\n`);

package/src/cli/systemd-service.ts

@@ -12,8 +12,8 @@
 import { execFileSync } from "node:child_process";
 import { mkdirSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
-import { resolveDaemonEntryPath } from "../client/tickets-client.js";
-import { TICKETS_DAEMON_NAMES } from "../daemon/ops.js";
+import { TICKETS_DAEMON_NAMES } from "../rpc/ops.js";
+import { resolveDaemonEntryPath } from "./tickets-client.js";
 
 export interface SystemdUnitOptions {
   bunBin: string;

package/src/{client → cli}/tickets-client.ts

@@ -10,8 +10,8 @@ import { fileURLToPath } from "node:url";
 import { AuthenticatedRpcClient } from "@danypops/vehicle-client/rpc-client";
 import type { DaemonHandle } from "@danypops/vehicle-server/paths";
 import { ensureAuthToken, readDaemonHandle, resolveDaemonPaths } from "@danypops/vehicle-server/paths";
-import { TICKETS_DAEMON_NAMES, type TicketOperation, type TicketOpInputs, type TicketOpOutputs } from "../daemon/ops.js";
-import { packageRoot } from "../util/package-root.js";
+import { TICKETS_DAEMON_NAMES, type TicketOperation, type TicketOpInputs, type TicketOpOutputs } from "../rpc/ops.js";
+import { packageRoot } from "./package-root.js";
 
 export function ticketsPaths(env?: Record<string, string | undefined>) {
   return resolveDaemonPaths(TICKETS_DAEMON_NAMES, env ? { env } : {});
@@ -32,7 +32,7 @@ async function isAlive(handle: DaemonHandle, token: string): Promise<boolean> {
 /** Absolute path to the daemon's real entry point, resolved from this package's own root. Used both to spawn it on demand and to point a systemd unit's ExecStart at it (see cli/systemd-service.ts). */
 export function resolveDaemonEntryPath(): string {
   const root = packageRoot(dirname(fileURLToPath(import.meta.url)));
-  return join(root, "src", "daemon", "main.ts");
+  return join(root, "src", "process", "main.ts");
 }
 
 function spawnDaemon(): void {
@@ -68,7 +68,7 @@ export async function ensureDaemonRunning(opts: EnsureDaemonOptions = {}): Promi
   }
 
   if (opts.autoStart === false) {
-    throw new Error("tickets daemon is not running. Start it with `npm run daemon` (or `bun run src/daemon/main.ts`).");
+    throw new Error("tickets daemon is not running. Start it with `npm run daemon` (or `bun run src/process/main.ts`).");
   }
 
   spawnDaemon();
@@ -80,7 +80,7 @@ export async function ensureDaemonRunning(opts: EnsureDaemonOptions = {}): Promi
 }
 
 export interface VehicleClientTarget {
-  /** Base URL for tickets' VehicleRegistry (see ../vehicle/tickets-vehicle.ts) -- @danypops/vehicle-client's RemoteVehicleClient mounts its own /vehicle/manifest, /vehicle/invoke, /vehicle/cancel routes under this. */
+  /** Base URL for tickets' VehicleRegistry (see ../agent-tools/tickets-vehicle.ts) -- @danypops/vehicle-client's RemoteVehicleClient mounts its own /vehicle/manifest, /vehicle/invoke, /vehicle/cancel routes under this. */
   baseUrl: string;
   token: string;
 }
@@ -88,7 +88,7 @@ export interface VehicleClientTarget {
 /**
  * Narrow, side-effect-free surface for a Vehicle-projected domain consumer --
  * same daemon, same handle file, same Bearer token every other tickets RPC
- * call already uses (see daemon/server.ts's buildApp, which mounts the
+ * call already uses (see rpc/server.ts's buildApp, which mounts the
  * Vehicle HTTP app at /vehicle/* on this same port). Deliberately does NOT
  * call ensureDaemonRunning: that spawns the daemon and mints a fresh auth
  * token file as a side effect, which is wrong to do just from a Pi

package/src/config/config.ts

@@ -10,12 +10,12 @@ import { type TryEnigmaCredential, tryEnigmaCredential } from "@danypops/enigma-
 import type { MaintenanceTask } from "@danypops/vehicle-server/daemon";
 import type { Logger } from "@danypops/vehicle-server/logging";
 import { parse as parseYaml } from "yaml";
-import { GitHubRepository } from "../adapters/github.js";
-import { GitLabRepository } from "../adapters/gitlab.js";
-import { JiraRepository } from "../adapters/jira.js";
-import type { TicketService } from "../application/service.js";
 import { isTokenFresh, loadToken } from "../auth/token-store.js";
-import type { IssueRepository } from "../ports/repository.js";
+import { GitHubRepository } from "../github/github.js";
+import { GitLabRepository } from "../gitlab/gitlab.js";
+import type { IssueRepository } from "../issue/repository.js";
+import type { TicketService } from "../issue/service.js";
+import { JiraRepository } from "../jira/jira.js";
 
 export interface BackendConfig {
   /** Adapter type: "github" | "gitlab" | "jira". Falls back to the config key when omitted. */

package/src/{adapters → github}/github.ts

@@ -21,8 +21,8 @@
 
 import { RequestError } from "@octokit/request-error";
 import { Octokit } from "octokit";
-import type { Comment, CreateInput, Issue, ListFilter, parsePriority, Status, UpdateInput } from "../domain/issue.js";
-import { ApiError, AuthRequiredError, IssueNotFoundError } from "./errors.js";
+import { ApiError, AuthRequiredError, IssueNotFoundError } from "../issue/errors.js";
+import type { Comment, CreateInput, Issue, ListFilter, parsePriority, Status, UpdateInput } from "../issue/issue.js";
 
 const DEFAULT_TIMEOUT_MS = 30_000;
 

package/src/{adapters → gitlab}/gitlab.ts

@@ -14,8 +14,8 @@
 import { isIP } from "node:net";
 import { GitbeakerRequestError, type RequesterType, type ResourceOptions } from "@gitbeaker/requester-utils";
 import { Gitlab } from "@gitbeaker/rest";
-import type { Comment, CreateInput, Issue, ListFilter, parsePriority, Status, UpdateInput } from "../domain/issue.js";
-import { ApiError, AuthRequiredError, InvalidUrlError, IssueNotFoundError } from "./errors.js";
+import { ApiError, AuthRequiredError, InvalidUrlError, IssueNotFoundError } from "../issue/errors.js";
+import type { Comment, CreateInput, Issue, ListFilter, parsePriority, Status, UpdateInput } from "../issue/issue.js";
 
 export interface GitLabOptions {
   projectId: string;

package/src/{adapters/http.ts → http-client.ts}

@@ -1,4 +1,4 @@
-import { ApiError, IssueNotFoundError } from "./errors.js";
+import { ApiError, IssueNotFoundError } from "./issue/errors.js";
 
 export type FetchLike = typeof fetch;
 
@@ -14,7 +14,7 @@ export interface HttpClientOptions {
  * Thin authenticated JSON HTTP client shared by all adapters. Each adapter owns its
  * own auth header construction (Bearer, Basic, PRIVATE-TOKEN, ...) and passes it in
  * via `headers`. Accepts an injectable `fetchImpl` so adapters are testable without
- * a network — see test/adapters/*.test.ts.
+ * a network — see test/github/*.test.ts, test/gitlab/*.test.ts, test/jira/*.test.ts.
  */
 export class HttpClient {
   private readonly baseUrl: string;

package/src/index.ts

@@ -1,8 +1,3 @@
-export * from "./adapters/errors.js";
-export { type GitHubOptions, GitHubRepository } from "./adapters/github.js";
-export { type GitLabOptions, GitLabRepository } from "./adapters/gitlab.js";
-export { type JiraOptions, JiraRepository } from "./adapters/jira.js";
-export { NotSupportedError, TicketService, UnknownBackendError } from "./application/service.js";
 export { openUrl } from "./auth/browser.js";
 // Delegated OAuth (device flow for GitHub/GitLab, authorization code for Jira)
 // — see RESEARCH.md for why each backend gets a different flow.
@@ -19,7 +14,7 @@ export {
   type TicketsRpcClient,
   ticketsPaths,
   type VehicleClientTarget,
-} from "./client/tickets-client.js";
+} from "./cli/tickets-client.js";
 export {
   type BackendConfig,
   buildRepositories,
@@ -28,7 +23,12 @@ export {
   defaultConfigPath,
   loadConfig,
 } from "./config/config.js";
-export type { FocusStatus, TicketFocusState } from "./daemon/focus.js";
-export type { TicketOperation, TicketOpInputs, TicketOpOutputs } from "./daemon/ops.js";
-export * from "./domain/issue.js";
-export * from "./ports/repository.js";
+export { type GitHubOptions, GitHubRepository } from "./github/github.js";
+export { type GitLabOptions, GitLabRepository } from "./gitlab/gitlab.js";
+export * from "./issue/errors.js";
+export * from "./issue/issue.js";
+export * from "./issue/repository.js";
+export { NotSupportedError, TicketService, UnknownBackendError } from "./issue/service.js";
+export { type JiraOptions, JiraRepository } from "./jira/jira.js";
+export type { TicketOperation, TicketOpInputs, TicketOpOutputs } from "./rpc/ops.js";
+export type { FocusStatus, TicketFocusState } from "./sqlite/focus.js";

package/src/{ports → issue}/repository.ts

@@ -2,8 +2,8 @@
  * Outbound ports — contracts driven adapters (GitHub, GitLab, Jira, ...) implement.
  * The application layer depends only on these interfaces, never on a concrete adapter.
  */
-import type { Comment, CreateInput, Issue, ListFilter, UpdateInput } from "../domain/issue.js";
-import type { Template } from "../domain/template.js";
+import type { Comment, CreateInput, Issue, ListFilter, UpdateInput } from "./issue.js";
+import type { Template } from "./template.js";
 
 export interface IssueRepository {
   /** Backend identifier used in refs, e.g. "github", "gitlab", "jira". */

package/src/{application → issue}/service.ts

@@ -4,9 +4,8 @@
  * routes every call to the named backend's repository. Depends only on ports,
  * never on a concrete adapter.
  */
-import type { Comment, CreateInput, Issue, ListFilter, UpdateInput } from "../domain/issue.js";
-import { parseRef } from "../domain/issue.js";
-import type { Template } from "../domain/template.js";
+import type { Comment, CreateInput, Issue, ListFilter, UpdateInput } from "./issue.js";
+import { parseRef } from "./issue.js";
 import {
   hasBoardFilterDiscovery,
   hasBoardQuickFilterDiscovery,
@@ -17,7 +16,8 @@ import {
   hasSyncScopeExpansion,
   hasTemplateDiscovery,
   type IssueRepository,
-} from "../ports/repository.js";
+} from "./repository.js";
+import type { Template } from "./template.js";
 
 export interface BackendCapabilities {
   readonly name: string;
@@ -92,7 +92,7 @@ export class TicketService {
 
   /**
    * Fetches issues for the poller's own background sync pass (see
-   * daemon/poller.ts). Prefers a backend's own expanded sync scope
+   * process/poller.ts). Prefers a backend's own expanded sync scope
    * (SyncScopeExpandable -- Jira: multiple configured projects plus
    * everything assigned to the authenticated user, unioned into one query)
    * over its plain default-project list() when one is configured; falls

package/src/{adapters → jira}/jira.ts

@@ -16,11 +16,11 @@
 import type { AxiosAdapter } from "axios";
 import type { HttpException, Config as JiraClientConfig } from "jira.js";
 import { AgileClient, Version2Client } from "jira.js";
-import type { Comment, CreateInput, Issue, IssueLink, ListFilter, parsePriority, Status, UpdateInput } from "../domain/issue.js";
-import type { Template } from "../domain/template.js";
-import { buildTemplateBody, extractTemplateSections } from "../domain/template.js";
-import * as manifest from "../manifest/manifest.js";
-import { ApiError, IssueNotFoundError } from "./errors.js";
+import { ApiError, IssueNotFoundError } from "../issue/errors.js";
+import type { Comment, CreateInput, Issue, IssueLink, ListFilter, parsePriority, Status, UpdateInput } from "../issue/issue.js";
+import type { Template } from "../issue/template.js";
+import { buildTemplateBody, extractTemplateSections } from "../issue/template.js";
+import * as manifest from "./manifest.js";
 
 /**
  * Basic-auth mode (email + API token) hits the tenant's own *.atlassian.net
@@ -48,7 +48,7 @@ export interface JiraBasicAuthOptions {
   axiosAdapter?: AxiosAdapter;
   /**
    * Directory holding this daemon's persisted field/status discovery manifests
-   * (see ../manifest/manifest.ts), typically configDir() from config.ts. When
+   * (see ./manifest.ts), typically configDir() from config.ts. When
    * omitted, discovery still works but nothing is persisted across restarts —
    * every test and any caller that doesn't care about persistence can leave it out.
    */
@@ -404,7 +404,7 @@ export class JiraRepository {
    * Discovers every custom field's display name -> customfield_XXXXX ID via
    * client.issueFields.getFields() (GET /rest/api/2/field), same live call
    * resolveCustomField already made lazily -- this just also persists the
-   * result to a manifest (see ../manifest/manifest.ts) so a later inbound
+   * result to a manifest (see ./manifest.ts) so a later inbound
    * lookup (fieldDisplayName) doesn't need a network round trip at all, and
    * survives a daemon restart. Ported from emcee's FieldService.DiscoverFields
    * (~/Workspace/emcee), same manifest file shape.
@@ -444,7 +444,7 @@ export class JiraRepository {
   /**
    * Samples the most recently created issues for a project/issue-type pair
    * and extracts the description section headers common to all of them --
-   * see ../domain/template.ts. Ported from emcee's TemplateService.DiscoverTemplate.
+   * see ../issue/template.ts. Ported from emcee's TemplateService.DiscoverTemplate.
    */
   async discoverTemplate(project: string, issueType: string, sampleSize = 5): Promise<Template | undefined> {
     const jql = `project = ${jqlQuote(project)} AND issuetype = ${jqlQuote(issueType)} ORDER BY created DESC`;

package/src/{daemon → process}/bootstrap.ts

@@ -10,16 +10,16 @@ import type { StartDaemonOptions } from "@danypops/vehicle-server/daemon";
 import { createLogger, type Logger } from "@danypops/vehicle-server/logging";
 import { ensureAuthToken, type PathEnvironment, resolveDaemonPaths } from "@danypops/vehicle-server/paths";
 import { checkpoint, openSqliteWithPragmas } from "@danypops/vehicle-server/storage";
-import { TicketService } from "../application/service.js";
+import { createTicketsVehicleRegistry, syncDiscoverAvailability } from "../agent-tools/tickets-vehicle.js";
 import { type BuildRepositories, buildRepositories, type Config, createBackendRefreshTask, loadConfig } from "../config/config.js";
-import type { IssueRepository } from "../ports/repository.js";
-import { createTicketsVehicleRegistry, syncDiscoverAvailability } from "../vehicle/tickets-vehicle.js";
-import { FOCUS_MIGRATIONS, FocusStore } from "./focus.js";
-import { LEDGER_MIGRATIONS, Ledger } from "./ledger.js";
-import { TICKETS_DAEMON_NAMES } from "./ops.js";
+import type { IssueRepository } from "../issue/repository.js";
+import { TicketService } from "../issue/service.js";
+import { TICKETS_DAEMON_NAMES } from "../rpc/ops.js";
+import { buildApp, type TicketsAppDeps } from "../rpc/server.js";
+import { FOCUS_MIGRATIONS, FocusStore } from "../sqlite/focus.js";
+import { LEDGER_MIGRATIONS, Ledger } from "../sqlite/ledger.js";
+import { SAVED_QUERY_MIGRATIONS, SavedQueryStore } from "../sqlite/saved-queries.js";
 import { createSyncTask } from "./poller.js";
-import { SAVED_QUERY_MIGRATIONS, SavedQueryStore } from "./saved-queries.js";
-import { buildApp, type TicketsAppDeps } from "./server.js";
 
 export interface BootstrapOptions {
   pathEnv?: PathEnvironment;

package/src/{daemon → process}/poller.ts

@@ -8,8 +8,8 @@
 
 import type { MaintenanceTask } from "@danypops/vehicle-server/daemon";
 import type { Logger } from "@danypops/vehicle-server/logging";
-import type { TicketService } from "../application/service.js";
-import type { Ledger } from "./ledger.js";
+import type { TicketService } from "../issue/service.js";
+import type { Ledger } from "../sqlite/ledger.js";
 
 const DEFAULT_SYNC_LIMIT = 50;
 

package/src/{daemon → rpc}/ops.ts

@@ -4,10 +4,10 @@
  * whatever consumes this package). Pure types, zero runtime imports, safe to
  * import from either side without pulling in bun:sqlite or Bun.serve.
  */
-import type { Comment, CreateInput, Issue, ListFilter, UpdateInput } from "../domain/issue.js";
-import type { Template } from "../domain/template.js";
-import type { TicketFocusState } from "./focus.js";
-import type { SavedQuery } from "./saved-queries.js";
+import type { Comment, CreateInput, Issue, ListFilter, UpdateInput } from "../issue/issue.js";
+import type { Template } from "../issue/template.js";
+import type { TicketFocusState } from "../sqlite/focus.js";
+import type { SavedQuery } from "../sqlite/saved-queries.js";
 
 export type TicketOperation =
   | "backends.list"

package/src/{daemon → rpc}/server.ts

@@ -1,7 +1,7 @@
 /**
  * Daemon HTTP surface: Bearer-token auth, /health, /ready, a single
  * dispatch endpoint (/api/v1/ops) per vehicle-server's http.ts convention,
- * and a VehicleRegistry (see ../vehicle/tickets-vehicle.ts) mounted at
+ * and a VehicleRegistry (see ../agent-tools/tickets-vehicle.ts) mounted at
  * /vehicle/* -- same daemon, same auth, same port, not a second service to
  * stand up. Every operation here has a CLI command (cli/index.ts) and a
  * pi-tickets tool action — no operation exists only for one caller.
@@ -11,13 +11,13 @@ import type { VehicleRegistry } from "@danypops/vehicle-server";
 import { createVehicleHttpApp } from "@danypops/vehicle-server/http";
 import type { Logger } from "@danypops/vehicle-server/logging";
 import { errorResponse, healthResponse, jsonResponse, readyResponse, requireBearerToken } from "@danypops/vehicle-server/rpc-http";
-import { AuthRequiredError, IssueNotFoundError } from "../adapters/errors.js";
-import { NotSupportedError, type TicketService, UnknownBackendError } from "../application/service.js";
-import { parseRef } from "../domain/issue.js";
-import { FocusError, type FocusStore } from "./focus.js";
-import type { Ledger } from "./ledger.js";
+import { AuthRequiredError, IssueNotFoundError } from "../issue/errors.js";
+import { parseRef } from "../issue/issue.js";
+import { NotSupportedError, type TicketService, UnknownBackendError } from "../issue/service.js";
+import { FocusError, type FocusStore } from "../sqlite/focus.js";
+import type { Ledger } from "../sqlite/ledger.js";
+import { SavedQueryNotFoundError, type SavedQueryStore } from "../sqlite/saved-queries.js";
 import { TICKET_OPERATIONS, type TicketOperation, type TicketOpInputs, type TicketOpOutputs } from "./ops.js";
-import { SavedQueryNotFoundError, type SavedQueryStore } from "./saved-queries.js";
 
 export interface TicketsAppDeps {
   service: TicketService;
@@ -36,7 +36,7 @@ export interface TicketsAppDeps {
    */
   onShutdownRequested?: () => void;
   /**
-   * Built by ../vehicle/tickets-vehicle.ts's createTicketsVehicleRegistry,
+   * Built by ../agent-tools/tickets-vehicle.ts's createTicketsVehicleRegistry,
    * from the same base deps this interface describes -- passed in rather
    * than built here to avoid a server.ts <-> tickets-vehicle.ts import cycle
    * (tickets-vehicle.ts already imports TICKET_OP_HANDLERS and this type
@@ -46,7 +46,7 @@ export interface TicketsAppDeps {
 }
 
 // Narrower than TicketsAppDeps on purpose: no real handler reads
-// deps.vehicleRegistry, and vehicle/tickets-vehicle.ts's own registry
+// deps.vehicleRegistry, and agent-tools/tickets-vehicle.ts's own registry
 // builder needs to call these before a registry exists to put there.
 export type Handler<Op extends TicketOperation> = (
   deps: Omit<TicketsAppDeps, "vehicleRegistry">,
@@ -55,7 +55,7 @@ export type Handler<Op extends TicketOperation> = (
 
 /**
  * The one real implementation of every ticket operation, shared verbatim by
- * the hand-rolled /api/v1/ops dispatch below and vehicle/tickets-vehicle.ts's
+ * the hand-rolled /api/v1/ops dispatch below and agent-tools/tickets-vehicle.ts's
  * VehicleRegistry projection -- never reimplemented a second time for the
  * newer surface.
  */
@@ -125,7 +125,7 @@ function statusFor(error: unknown): number {
 
 export function buildApp(deps: TicketsAppDeps): { fetch(request: Request): Promise<Response> } {
   // Same Bearer token as the rest of this API -- the Vehicle-projected
-  // domain (see ../vehicle/tickets-vehicle.ts) rides the same daemon, same
+  // domain (see ../agent-tools/tickets-vehicle.ts) rides the same daemon, same
   // auth, same port; it is not a second service to stand up or
   // authenticate against separately.
   const vehicleApp = createVehicleHttpApp({ registry: deps.vehicleRegistry, token: deps.token });

package/src/{daemon → sqlite}/ledger.ts

@@ -8,7 +8,7 @@
  */
 import type { Database } from "bun:sqlite";
 import type { Migration } from "@danypops/vehicle-server/storage";
-import type { Issue } from "../domain/issue.js";
+import type { Issue } from "../issue/issue.js";
 
 export const LEDGER_MIGRATIONS: Migration[] = [
   {

package/src/{daemon → sqlite}/saved-queries.ts

@@ -1,6 +1,6 @@
 /**
  * Saved queries — a name plus a raw query string (Jira JQL today; the backend
- * decides what "raw query" means via ports/repository.ts's RawQueryable) that
+ * decides what "raw query" means via issue/repository.ts's RawQueryable) that
  * can be run again by name instead of re-typing the query every time. This is
  * how a board/backlog view (e.g. a Jira board's quickFilter, or its backlog's
  * customFilter) becomes something the CLI/TUI/tool surface can browse