trekoon 0.1.5 → 0.1.6

package/README.md

@@ -52,7 +52,8 @@ npm i -g trekoon
 - `trekoon subtask <create|list|update|delete>`
 - `trekoon dep <add|remove|list>`
 - `trekoon sync <status|pull|resolve>`
-- `trekoon skills install [--link --editor opencode|claude] [--to <path>]`
+- `trekoon skills install [--link --editor opencode|claude|pi] [--to <path>]`
+- `trekoon skills update`
 - `trekoon wipe --yes`
 
 Global output modes:
@@ -173,17 +174,25 @@ You can also create a project-local editor link:
 trekoon skills install
 trekoon skills install --link --editor opencode
 trekoon skills install --link --editor claude
+trekoon skills install --link --editor pi
 trekoon skills install --link --editor opencode --to ./.custom-editor/skills
+trekoon skills update
 ```
 
 Path behavior:
 
 - Default opencode link path: `.opencode/skills/trekoon`
 - Default claude link path: `.claude/skills/trekoon`
+- Default pi link path: `.pi/skills/trekoon`
 - `--to <path>` overrides the editor root for link creation only.
 - `--to` does **not** move or copy `SKILL.md` to that path.
 - Re-running install is idempotent: it refreshes `SKILL.md` and reuses/replaces
   the same symlink target.
+- `trekoon skills update` is idempotent: it refreshes canonical
+  `.agents/skills/trekoon/SKILL.md` and reports default link states for
+  opencode/claude/pi as `missing`, `valid`, or `conflict`.
+- Update does not mutate default links; conflicts are reported with actionable
+  path context.
 - If the link destination exists as a non-link path, install fails with an
   actionable conflict error.
 
@@ -215,7 +224,7 @@ Trekoon does not mutate global editor config directories.
 - [ ] `trekoon sync status` shows no unresolved conflicts
 - [ ] done tasks/subtasks are marked completed
 - [ ] dependency graph has no stale blockers
-- [ ] final AI check: `trekoon --json epic show <epic-id>`
+- [ ] final AI check: `trekoon --toon epic show <epic-id>`
 
 ## Implementation principles
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trekoon",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "AI-first local issue tracker CLI.",
   "license": "MIT",
   "type": "module",

package/src/commands/dep.ts

@@ -1,7 +1,8 @@
 import { parseArgs } from "./arg-parser";
 
-import { DomainError } from "../domain/types";
+import { MutationService } from "../domain/mutation-service";
 import { TrackerDomain } from "../domain/tracker-domain";
+import { DomainError } from "../domain/types";
 import { failResult, okResult } from "../io/output";
 import { type CliContext, type CliResult } from "../runtime/command-types";
 import { openTrekoonDatabase } from "../storage/database";
@@ -42,10 +43,11 @@ export async function runDep(context: CliContext): Promise<CliResult> {
     const sourceId: string = parsed.positional[1] ?? "";
     const dependsOnId: string = parsed.positional[2] ?? "";
     const domain = new TrackerDomain(database.db);
+    const mutations = new MutationService(database.db, context.cwd);
 
     switch (subcommand) {
       case "add": {
-        const dependency = domain.addDependency(sourceId, dependsOnId);
+        const dependency = mutations.addDependency(sourceId, dependsOnId);
 
         return okResult({
           command: "dep.add",
@@ -54,7 +56,7 @@ export async function runDep(context: CliContext): Promise<CliResult> {
         });
       }
       case "remove": {
-        const removed: number = domain.removeDependency(sourceId, dependsOnId);
+        const removed: number = mutations.removeDependency(sourceId, dependsOnId);
 
         return okResult({
           command: "dep.remove",

package/src/commands/epic.ts

@@ -1,7 +1,8 @@
 import { hasFlag, parseArgs, parseStrictPositiveInt, readEnumOption, readMissingOptionValue, readOption } from "./arg-parser";
 
-import { DomainError, type EpicRecord } from "../domain/types";
+import { MutationService } from "../domain/mutation-service";
 import { TrackerDomain } from "../domain/tracker-domain";
+import { DomainError, type EpicRecord } from "../domain/types";
 import { formatHumanTable } from "../io/human-table";
 import { failResult, okResult } from "../io/output";
 import { type CliContext, type CliResult } from "../runtime/command-types";
@@ -235,6 +236,7 @@ export async function runEpic(context: CliContext): Promise<CliResult> {
     const parsed = parseArgs(context.args);
     const subcommand: string | undefined = parsed.positional[0];
     const domain = new TrackerDomain(database.db);
+    const mutations = new MutationService(database.db, context.cwd);
 
     switch (subcommand) {
       case "create": {
@@ -248,7 +250,7 @@ export async function runEpic(context: CliContext): Promise<CliResult> {
         const title: string | undefined = readOption(parsed.options, "title", "t");
         const description: string | undefined = readOption(parsed.options, "description", "d");
         const status: string | undefined = readOption(parsed.options, "status", "s");
-        const epic = domain.createEpic({
+        const epic = mutations.createEpic({
           title: title ?? "",
           description: description ?? "",
           status,
@@ -467,7 +469,7 @@ export async function runEpic(context: CliContext): Promise<CliResult> {
 
           const targets = updateAll ? [...domain.listEpics()] : ids.map((id) => domain.getEpicOrThrow(id));
           const epics = targets.map((target) =>
-            domain.updateEpic(target.id, {
+            mutations.updateEpic(target.id, {
               status,
               description: append === undefined ? undefined : appendLine(target.description, append),
             }),
@@ -500,7 +502,7 @@ export async function runEpic(context: CliContext): Promise<CliResult> {
           append === undefined
             ? description
             : appendLine(domain.getEpicOrThrow(epicId).description, append);
-        const epic = domain.updateEpic(epicId, { title, description: nextDescription, status });
+        const epic = mutations.updateEpic(epicId, { title, description: nextDescription, status });
 
         return okResult({
           command: "epic.update",
@@ -510,7 +512,7 @@ export async function runEpic(context: CliContext): Promise<CliResult> {
       }
       case "delete": {
         const epicId: string = parsed.positional[1] ?? "";
-        domain.deleteEpic(epicId);
+        mutations.deleteEpic(epicId);
 
         return okResult({
           command: "epic.delete",

package/src/commands/help.ts

@@ -42,7 +42,7 @@ const COMMAND_HELP: Record<string, string> = {
   migrate: "Usage: trekoon migrate <status|rollback> [--to-version <n>]",
   sync: "Usage: trekoon sync <subcommand> [options]",
   skills:
-    "Usage: trekoon skills install [--link --editor opencode|claude] [--to <path>] (--to sets symlink root for --link only; install path always <cwd>/.agents/skills/trekoon/SKILL.md)",
+    "Usage: trekoon skills install [--link --editor opencode|claude|pi] [--to <path>] | trekoon skills update (--to sets symlink root for --link only; install path always <cwd>/.agents/skills/trekoon/SKILL.md; update refreshes canonical SKILL and reports default link states)",
   help: "Usage: trekoon help [command] [--json|--toon]",
 };
 

package/src/commands/skills.ts

@@ -7,10 +7,15 @@ import { hasFlag, parseArgs, readMissingOptionValue, readOption } from "./arg-pa
 import { failResult, okResult } from "../io/output";
 import { type CliContext, type CliResult } from "../runtime/command-types";
 
-const SKILLS_USAGE = "Usage: trekoon skills install [--link --editor opencode|claude] [--to <path>]";
-const EDITOR_NAMES = ["opencode", "claude"] as const;
+const SKILLS_USAGE = [
+  "Usage:",
+  "  trekoon skills install [--link --editor opencode|claude|pi] [--to <path>]",
+  "  trekoon skills update",
+].join("\n");
+const EDITOR_NAMES = ["opencode", "claude", "pi"] as const;
 
 type EditorName = (typeof EDITOR_NAMES)[number];
+type LinkStateStatus = "missing" | "valid" | "conflict";
 
 interface InstallOutcome {
   readonly sourcePath: string;
@@ -20,6 +25,22 @@ interface InstallOutcome {
   readonly linkTarget: string | null;
 }
 
+interface LinkState {
+  readonly editor: EditorName;
+  readonly linkPath: string;
+  readonly expectedTarget: string;
+  readonly status: LinkStateStatus;
+  readonly existingTarget: string | null;
+  readonly conflictCode: "non_link" | "wrong_target" | null;
+}
+
+interface UpdateOutcome {
+  readonly sourcePath: string;
+  readonly installedPath: string;
+  readonly installedDir: string;
+  readonly links: readonly LinkState[];
+}
+
 function invalidArgs(message: string): CliResult {
   return failResult({
     command: "skills",
@@ -68,7 +89,61 @@ function resolveLinkRoot(cwd: string, editor: EditorName, toOverride: string | u
     return join(cwd, ".opencode", "skills");
   }
 
-  return join(cwd, ".claude", "skills");
+  if (editor === "claude") {
+    return join(cwd, ".claude", "skills");
+  }
+
+  return join(cwd, ".pi", "skills");
+}
+
+function resolveDefaultLinkPath(cwd: string, editor: EditorName): string {
+  return join(resolveLinkRoot(cwd, editor, undefined), "trekoon");
+}
+
+function installCanonicalSkill(cwd: string): CliResult | { sourcePath: string; installedPath: string; installedDir: string } {
+  const sourcePath: string = resolveBundledSkillFilePath();
+  if (!existsSync(sourcePath)) {
+    return failResult({
+      command: "skills.install",
+      human: `Bundled skill asset not found at ${sourcePath}`,
+      data: {
+        code: "missing_asset",
+        sourcePath,
+      },
+      error: {
+        code: "missing_asset",
+        message: "Bundled skill asset not found",
+      },
+    });
+  }
+
+  const installedPath: string = join(cwd, ".agents", "skills", "trekoon", "SKILL.md");
+  const installedDir: string = dirname(installedPath);
+
+  try {
+    mkdirSync(installedDir, { recursive: true });
+    copyFileSync(sourcePath, installedPath);
+  } catch (error: unknown) {
+    const message = error instanceof Error ? error.message : "Unknown skills install failure";
+    return failResult({
+      command: "skills.install",
+      human: `Failed to install skill: ${message}`,
+      data: {
+        code: "install_failed",
+        message,
+      },
+      error: {
+        code: "install_failed",
+        message,
+      },
+    });
+  }
+
+  return {
+    sourcePath,
+    installedPath,
+    installedDir,
+  };
 }
 
 function replaceOrCreateSymlink(linkPath: string, targetPath: string): CliResult | null {
@@ -120,6 +195,56 @@ function replaceOrCreateSymlink(linkPath: string, targetPath: string): CliResult
   return null;
 }
 
+function inspectDefaultLink(cwd: string, editor: EditorName, installedDir: string): LinkState {
+  const linkPath: string = resolveDefaultLinkPath(cwd, editor);
+  const expectedTarget: string = resolve(installedDir);
+
+  if (!existsSync(linkPath)) {
+    return {
+      editor,
+      linkPath,
+      expectedTarget,
+      status: "missing",
+      existingTarget: null,
+      conflictCode: null,
+    };
+  }
+
+  const entry = lstatSync(linkPath);
+  if (!entry.isSymbolicLink()) {
+    return {
+      editor,
+      linkPath,
+      expectedTarget,
+      status: "conflict",
+      existingTarget: null,
+      conflictCode: "non_link",
+    };
+  }
+
+  const existingRawTarget: string = readlinkSync(linkPath);
+  const existingTarget: string = toAbsolutePath(dirname(linkPath), existingRawTarget);
+  if (existingTarget !== expectedTarget) {
+    return {
+      editor,
+      linkPath,
+      expectedTarget,
+      status: "conflict",
+      existingTarget,
+      conflictCode: "wrong_target",
+    };
+  }
+
+  return {
+    editor,
+    linkPath,
+    expectedTarget,
+    status: "valid",
+    existingTarget,
+    conflictCode: null,
+  };
+}
+
 function runSkillsInstall(context: CliContext): CliResult {
   const parsed = parseArgs(context.args);
   const missingValue = readMissingOptionValue(parsed.missingOptionValues, "editor", "to");
@@ -150,11 +275,11 @@ function runSkillsInstall(context: CliContext): CliResult {
   }
 
   if (wantsLink && rawEditor === undefined) {
-    return invalidArgs("skills install --link requires --editor opencode|claude.");
+    return invalidArgs("skills install --link requires --editor opencode|claude|pi.");
   }
 
   if (rawEditor !== undefined && !EDITOR_NAMES.includes(rawEditor as EditorName)) {
-    return invalidInput("skills.install", "Invalid --editor value. Use: opencode, claude", {
+    return invalidInput("skills.install", "Invalid --editor value. Use: opencode, claude, pi", {
       editor: rawEditor,
       allowedEditors: EDITOR_NAMES,
     });
@@ -162,38 +287,21 @@ function runSkillsInstall(context: CliContext): CliResult {
 
   const editor: EditorName | undefined = rawEditor as EditorName | undefined;
 
-  const sourcePath: string = resolveBundledSkillFilePath();
-  if (!existsSync(sourcePath)) {
-    return failResult({
-      command: "skills.install",
-      human: `Bundled skill asset not found at ${sourcePath}`,
-      data: {
-        code: "missing_asset",
-        sourcePath,
-      },
-      error: {
-        code: "missing_asset",
-        message: "Bundled skill asset not found",
-      },
-    });
+  const installResult = installCanonicalSkill(context.cwd);
+  if ("ok" in installResult) {
+    return installResult;
   }
 
-  const installPath = join(context.cwd, ".agents", "skills", "trekoon", "SKILL.md");
-  const installDir = dirname(installPath);
-
   let outcome: InstallOutcome;
 
   try {
-    mkdirSync(installDir, { recursive: true });
-    copyFileSync(sourcePath, installPath);
-
     let linkPath: string | null = null;
     let linkTarget: string | null = null;
 
     if (wantsLink && editor !== undefined) {
       const linkRoot: string = resolveLinkRoot(context.cwd, editor, rawTo);
       linkPath = join(linkRoot, "trekoon");
-      linkTarget = installDir;
+      linkTarget = installResult.installedDir;
       const linkFailure = replaceOrCreateSymlink(linkPath, linkTarget);
       if (linkFailure) {
         return linkFailure;
@@ -201,9 +309,9 @@ function runSkillsInstall(context: CliContext): CliResult {
     }
 
     outcome = {
-      sourcePath,
-      installedPath: installPath,
-      installedDir: installDir,
+      sourcePath: installResult.sourcePath,
+      installedPath: installResult.installedPath,
+      installedDir: installResult.installedDir,
       linkPath,
       linkTarget,
     };
@@ -249,6 +357,77 @@ function runSkillsInstall(context: CliContext): CliResult {
   });
 }
 
+function runSkillsUpdate(context: CliContext): CliResult {
+  const parsed = parseArgs(context.args);
+  if (parsed.positional.length > 1) {
+    return invalidArgs("Unexpected positional arguments for skills update.");
+  }
+
+  if (parsed.flags.size > 0 || parsed.options.size > 0) {
+    return invalidArgs("skills update takes no options.");
+  }
+
+  const installResult = installCanonicalSkill(context.cwd);
+  if ("ok" in installResult) {
+    return failResult({
+      command: "skills.update",
+      human: installResult.human,
+      data: installResult.data,
+      error:
+        installResult.error ?? {
+          code: "install_failed",
+          message: "Failed to refresh canonical skill",
+        },
+    });
+  }
+
+  const links: readonly LinkState[] = EDITOR_NAMES.map((editor) =>
+    inspectDefaultLink(context.cwd, editor, installResult.installedDir),
+  );
+
+  const outcome: UpdateOutcome = {
+    sourcePath: installResult.sourcePath,
+    installedPath: installResult.installedPath,
+    installedDir: installResult.installedDir,
+    links,
+  };
+
+  const linkSummary: string = outcome.links
+    .map((entry) => {
+      if (entry.status === "missing") {
+        return `- ${entry.editor}: missing (${entry.linkPath})`;
+      }
+
+      if (entry.status === "valid") {
+        return `- ${entry.editor}: valid (${entry.linkPath} -> ${entry.expectedTarget})`;
+      }
+
+      if (entry.conflictCode === "non_link") {
+        return `- ${entry.editor}: conflict (non-link path at ${entry.linkPath})`;
+      }
+
+      return `- ${entry.editor}: conflict (points to ${entry.existingTarget})`;
+    })
+    .join("\n");
+
+  return okResult({
+    command: "skills.update",
+    human: [
+      "Updated Trekoon skill in canonical path.",
+      `Source: ${outcome.sourcePath}`,
+      `Installed file: ${outcome.installedPath}`,
+      "Default link states:",
+      linkSummary,
+    ].join("\n"),
+    data: {
+      sourcePath: outcome.sourcePath,
+      installedPath: outcome.installedPath,
+      installedDir: outcome.installedDir,
+      links: outcome.links,
+    },
+  });
+}
+
 export async function runSkills(context: CliContext): Promise<CliResult> {
   const parsed = parseArgs(context.args);
   const subcommand: string | undefined = parsed.positional[0];
@@ -259,6 +438,8 @@ export async function runSkills(context: CliContext): Promise<CliResult> {
   switch (subcommand) {
     case "install":
       return runSkillsInstall(context);
+    case "update":
+      return runSkillsUpdate(context);
     default:
       return invalidArgs(`Unknown skills subcommand '${subcommand}'.`);
   }

package/src/commands/subtask.ts

@@ -1,7 +1,8 @@
 import { hasFlag, parseArgs, parseStrictPositiveInt, readEnumOption, readMissingOptionValue, readOption } from "./arg-parser";
 
-import { DomainError, type SubtaskRecord } from "../domain/types";
+import { MutationService } from "../domain/mutation-service";
 import { TrackerDomain } from "../domain/tracker-domain";
+import { DomainError, type SubtaskRecord } from "../domain/types";
 import { formatHumanTable } from "../io/human-table";
 import { failResult, okResult } from "../io/output";
 import { type CliContext, type CliResult } from "../runtime/command-types";
@@ -126,6 +127,7 @@ export async function runSubtask(context: CliContext): Promise<CliResult> {
     const parsed = parseArgs(context.args);
     const subcommand: string | undefined = parsed.positional[0];
     const domain = new TrackerDomain(database.db);
+    const mutations = new MutationService(database.db, context.cwd);
 
     switch (subcommand) {
       case "create": {
@@ -141,7 +143,7 @@ export async function runSubtask(context: CliContext): Promise<CliResult> {
         const title: string | undefined = readOption(parsed.options, "title") ?? parsed.positional[2];
         const description: string | undefined = readOption(parsed.options, "description", "d");
         const status: string | undefined = readOption(parsed.options, "status", "s");
-        const subtask = domain.createSubtask({
+        const subtask = mutations.createSubtask({
           taskId: taskId ?? "",
           title: title ?? "",
           description,
@@ -337,7 +339,7 @@ export async function runSubtask(context: CliContext): Promise<CliResult> {
 
           const targets = updateAll ? [...domain.listSubtasks()] : ids.map((id) => domain.getSubtaskOrThrow(id));
           const subtasks = targets.map((target) =>
-            domain.updateSubtask(target.id, {
+            mutations.updateSubtask(target.id, {
               status,
               description: append === undefined ? undefined : appendLine(target.description, append),
             }),
@@ -370,7 +372,7 @@ export async function runSubtask(context: CliContext): Promise<CliResult> {
           append === undefined
             ? description
             : appendLine(domain.getSubtaskOrThrow(subtaskId).description, append);
-        const subtask = domain.updateSubtask(subtaskId, { title, description: nextDescription, status });
+        const subtask = mutations.updateSubtask(subtaskId, { title, description: nextDescription, status });
 
         return okResult({
           command: "subtask.update",
@@ -380,7 +382,7 @@ export async function runSubtask(context: CliContext): Promise<CliResult> {
       }
       case "delete": {
         const subtaskId: string = parsed.positional[1] ?? "";
-        domain.deleteSubtask(subtaskId);
+        mutations.deleteSubtask(subtaskId);
 
         return okResult({
           command: "subtask.delete",

package/src/commands/sync.ts

@@ -1,8 +1,8 @@
 import { failResult, okResult } from "../io/output";
 import { type CliContext, type CliResult } from "../runtime/command-types";
 import { MissingBranchDatabaseError } from "../sync/branch-db";
-import { syncPull, syncResolve, syncStatus } from "../sync/service";
-import { type SyncResolution } from "../sync/types";
+import { getSyncConflict, listSyncConflicts, syncPull, syncResolve, syncStatus } from "../sync/service";
+import { type SyncConflictMode, type SyncResolution } from "../sync/types";
 
 function parseOption(args: readonly string[], option: string): string | null {
   const index: number = args.indexOf(option);
@@ -17,7 +17,7 @@ function parseOption(args: readonly string[], option: string): string | null {
 function usage(message: string): CliResult {
   return failResult({
     command: "sync",
-    human: `${message}\nUsage: trekoon sync <status|pull|resolve> [options]`,
+    human: `${message}\nUsage: trekoon sync <status|pull|resolve|conflicts> [options]`,
     data: { message },
     error: {
       code: "invalid_args",
@@ -35,6 +35,50 @@ function statusMessage(sourceBranch: string, ahead: number, behind: number, conf
   ].join("\n");
 }
 
+function formatConflictList(
+  conflicts: ReadonlyArray<{
+    id: string;
+    entity_kind: string;
+    entity_id: string;
+    field_name: string;
+    resolution: string;
+  }>,
+): string {
+  if (conflicts.length === 0) {
+    return "No conflicts found.";
+  }
+
+  return conflicts
+    .map((conflict) =>
+      [
+        conflict.id,
+        conflict.entity_kind,
+        conflict.entity_id,
+        conflict.field_name,
+        conflict.resolution,
+      ].join(" | "),
+    )
+    .join("\n");
+}
+
+function parseConflictMode(args: readonly string[]): SyncConflictMode | null {
+  const modeIndex = args.indexOf("--mode");
+  if (modeIndex < 0) {
+    return "pending";
+  }
+
+  const explicitMode = args[modeIndex + 1];
+  if (!explicitMode || explicitMode.startsWith("--")) {
+    return null;
+  }
+
+  if (explicitMode === "pending" || explicitMode === "all") {
+    return explicitMode;
+  }
+
+  return null;
+}
+
 export async function runSync(context: CliContext): Promise<CliResult> {
   const subcommand: string | undefined = context.args[0];
 
@@ -95,6 +139,57 @@ export async function runSync(context: CliContext): Promise<CliResult> {
       });
     }
 
+    if (subcommand === "conflicts") {
+      const conflictsCommand: string | undefined = context.args[1];
+      if (!conflictsCommand) {
+        return usage("sync conflicts requires list|show.");
+      }
+
+      if (conflictsCommand === "list") {
+        const mode = parseConflictMode(context.args);
+        if (!mode) {
+          return usage("sync conflicts list --mode only accepts pending|all.");
+        }
+
+        const conflicts = listSyncConflicts(context.cwd, mode);
+
+        return okResult({
+          command: "sync conflicts list",
+          human: formatConflictList(conflicts),
+          data: {
+            mode,
+            conflicts,
+          },
+        });
+      }
+
+      if (conflictsCommand === "show") {
+        const conflictId: string | undefined = context.args[2];
+        if (!conflictId) {
+          return usage("sync conflicts show requires <conflict-id>.");
+        }
+
+        const conflict = getSyncConflict(context.cwd, conflictId);
+
+        return okResult({
+          command: "sync conflicts show",
+          human: [
+            `Conflict: ${conflict.id}`,
+            `Entity: ${conflict.entityKind} ${conflict.entityId}`,
+            `Field: ${conflict.fieldName}`,
+            `Resolution: ${conflict.resolution}`,
+            `Ours: ${JSON.stringify(conflict.oursValue)}`,
+            `Theirs: ${JSON.stringify(conflict.theirsValue)}`,
+          ].join("\n"),
+          data: {
+            conflict,
+          },
+        });
+      }
+
+      return usage(`Unknown sync conflicts subcommand '${conflictsCommand}'.`);
+    }
+
     return usage(`Unknown sync subcommand '${subcommand}'.`);
   } catch (error) {
     if (error instanceof MissingBranchDatabaseError) {