team-toon-tack 1.0.4 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "team-toon-tack",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Linear task sync & management CLI with TOON format",
   "type": "module",
   "bin": {

package/scripts/init.ts

@@ -277,17 +277,14 @@ async function init() {
       complete: 'Done',
       need_review: 'In Review'
     },
+    priority_order: ['urgent', 'high', 'medium', 'low', 'none'],
     current_cycle: currentCycle ? {
       id: currentCycle.id,
       name: currentCycle.name || 'Cycle',
       start_date: currentCycle.startsAt?.toISOString().split('T')[0] || '',
       end_date: currentCycle.endsAt?.toISOString().split('T')[0] || ''
-    } : {
-      id: '',
-      name: 'No active cycle',
-      start_date: '',
-      end_date: ''
-    }
+    } : undefined,
+    cycle_history: []
   };
 
   // Find current user key
@@ -309,11 +306,23 @@ async function init() {
       const existingContent = await fs.readFile(paths.configPath, 'utf-8');
       const existingConfig = decode(existingContent) as unknown as Config;
 
-      // Merge: new data takes precedence but preserve existing custom fields
+      // Merge: preserve existing custom fields
       config.status_transitions = {
         ...existingConfig.status_transitions,
         ...config.status_transitions
       };
+      // Preserve cycle history
+      if (existingConfig.cycle_history) {
+        config.cycle_history = existingConfig.cycle_history;
+      }
+      // Preserve current_cycle if not fetched fresh
+      if (!currentCycle && existingConfig.current_cycle) {
+        config.current_cycle = existingConfig.current_cycle;
+      }
+      // Preserve priority_order if exists
+      if (existingConfig.priority_order) {
+        config.priority_order = existingConfig.priority_order;
+      }
     } catch {
       // Ignore merge errors
     }

package/scripts/sync.ts

@@ -1,4 +1,4 @@
-import { getLinearClient, loadConfig, loadLocalConfig, saveConfig, loadCycleData, saveCycleData, getTeamId, CycleData, Task, Attachment, Comment } from './utils';
+import { getLinearClient, loadConfig, loadLocalConfig, loadCycleData, saveCycleData, saveConfig, getTeamId, getPrioritySortIndex, CycleData, Task, Attachment, Comment, CycleInfo } from './utils';
 
 async function sync() {
   const args = process.argv.slice(2);
@@ -47,24 +47,46 @@ Examples:
   }
 
   const activeCycle = cycles.nodes[0];
-  const cycleChanged = config.current_cycle.id !== activeCycle.id;
-
-  if (cycleChanged) {
-    console.log(`Cycle changed: ${config.current_cycle.name} → ${activeCycle.name}`);
-    config.current_cycle = {
-      id: activeCycle.id,
-      name: activeCycle.name ?? `Cycle`,
-      start_date: activeCycle.startsAt?.toISOString().split('T')[0] ?? '',
-      end_date: activeCycle.endsAt?.toISOString().split('T')[0] ?? ''
-    };
+  const cycleId = activeCycle.id;
+  const cycleName = activeCycle.name ?? 'Cycle';
+  const newCycleInfo: CycleInfo = {
+    id: cycleId,
+    name: cycleName,
+    start_date: activeCycle.startsAt?.toISOString().split('T')[0] ?? '',
+    end_date: activeCycle.endsAt?.toISOString().split('T')[0] ?? ''
+  };
+
+  // Check if cycle changed and update config with history
+  const existingData = await loadCycleData();
+  const oldCycleId = config.current_cycle?.id ?? existingData?.cycleId;
+
+  if (oldCycleId && oldCycleId !== cycleId) {
+    const oldCycleName = config.current_cycle?.name ?? existingData?.cycleName ?? 'Unknown';
+    console.log(`Cycle changed: ${oldCycleName} → ${cycleName}`);
+
+    // Move old cycle to history
+    if (config.current_cycle) {
+      config.cycle_history = config.cycle_history ?? [];
+      config.cycle_history.unshift(config.current_cycle);
+      // Keep only last 10 cycles
+      if (config.cycle_history.length > 10) {
+        config.cycle_history = config.cycle_history.slice(0, 10);
+      }
+    }
+
+    // Update current cycle
+    config.current_cycle = newCycleInfo;
     await saveConfig(config);
-    console.log('Config updated with new cycle.');
+    console.log('Config updated with new cycle (old cycle saved to history).');
   } else {
-    console.log(`Current cycle: ${config.current_cycle.name}`);
+    // Update current cycle info even if ID unchanged (dates might change)
+    if (!config.current_cycle || config.current_cycle.id !== cycleId) {
+      config.current_cycle = newCycleInfo;
+      await saveConfig(config);
+    }
+    console.log(`Current cycle: ${cycleName}`);
   }
 
-  const cycleId = config.current_cycle.id;
-
   // Phase 2: Fetch workflow states
   const workflowStates = await client.workflowStates({
     filter: { team: { id: { eq: teamId } } }
@@ -72,8 +94,7 @@ Examples:
   const stateMap = new Map(workflowStates.nodes.map(s => [s.name, s.id]));
   const testingStateId = stateMap.get('Testing');
 
-  // Phase 3: Read existing local state
-  const existingData = await loadCycleData();
+  // Phase 3: Build existing tasks map for preserving local status
   const existingTasksMap = new Map(existingData?.tasks.map(t => [t.id, t]));
 
   // Phase 4: Fetch current issues with full content
@@ -168,22 +189,22 @@ Examples:
     tasks.push(task);
   }
 
-  // Sort by priority (urgent first)
+  // Sort by priority using config order
   tasks.sort((a, b) => {
-    const pa = a.priority === 0 ? 5 : a.priority;
-    const pb = b.priority === 0 ? 5 : b.priority;
+    const pa = getPrioritySortIndex(a.priority, config.priority_order);
+    const pb = getPrioritySortIndex(b.priority, config.priority_order);
     return pa - pb;
   });
 
   const newData: CycleData = {
     cycleId: cycleId,
-    cycleName: config.current_cycle.name,
+    cycleName: cycleName,
     updatedAt: new Date().toISOString(),
     tasks: tasks
   };
 
   await saveCycleData(newData);
-  console.log(`\n✅ Synced ${tasks.length} tasks for ${config.current_cycle.name}.`);
+  console.log(`\n✅ Synced ${tasks.length} tasks for ${cycleName}.`);
   if (updatedCount > 0) {
     console.log(`   Updated ${updatedCount} issues to Testing in Linear.`);
   }

package/scripts/utils.ts

@@ -52,14 +52,41 @@ export interface LabelConfig {
   color?: string;
 }
 
+export interface CycleInfo {
+  id: string;
+  name: string;
+  start_date: string;
+  end_date: string;
+}
+
 export interface Config {
   teams: Record<string, TeamConfig>;
   users: Record<string, UserConfig>;
-  labels: Record<string, LabelConfig>;
-  priorities: Record<string, { value: number; name: string }>;
-  statuses: Record<string, { name: string; type: string }>;
-  status_transitions: Record<string, string>;
-  current_cycle: { id: string; name: string; start_date: string; end_date: string };
+  labels?: Record<string, LabelConfig>;
+  priorities?: Record<string, { value: number; name: string }>;
+  statuses?: Record<string, { name: string; type: string }>;
+  status_transitions?: Record<string, string>;
+  priority_order?: string[];  // e.g., ['urgent', 'high', 'medium', 'low', 'none']
+  current_cycle?: CycleInfo;
+  cycle_history?: CycleInfo[];
+}
+
+// Linear priority value to name mapping (fixed by Linear API)
+export const PRIORITY_NAMES: Record<number, string> = {
+  0: 'none',
+  1: 'urgent',
+  2: 'high',
+  3: 'medium',
+  4: 'low'
+};
+
+export const DEFAULT_PRIORITY_ORDER = ['urgent', 'high', 'medium', 'low', 'none'];
+
+export function getPrioritySortIndex(priority: number, priorityOrder?: string[]): number {
+  const order = priorityOrder ?? DEFAULT_PRIORITY_ORDER;
+  const name = PRIORITY_NAMES[priority] ?? 'none';
+  const index = order.indexOf(name);
+  return index === -1 ? order.length : index;
 }
 
 export interface Attachment {

package/scripts/work-on.ts

@@ -1,8 +1,8 @@
 import prompts from 'prompts';
-import { getLinearClient, loadConfig, loadLocalConfig, loadCycleData, saveCycleData, getUserEmail, getTeamId } from './utils';
+import { getLinearClient, loadConfig, loadLocalConfig, loadCycleData, saveCycleData, getUserEmail, getTeamId, getPrioritySortIndex } from './utils';
 
 const PRIORITY_LABELS: Record<number, string> = {
-  0: '⚪',
+  0: '⚪ None',
   1: '🔴 Urgent',
   2: '🟠 High',
   3: '🟡 Medium',
@@ -53,8 +53,8 @@ Examples:
       !excludedEmails.has(t.assignee ?? '')
     )
     .sort((a, b) => {
-      const pa = a.priority === 0 ? 5 : a.priority;
-      const pb = b.priority === 0 ? 5 : b.priority;
+      const pa = getPrioritySortIndex(a.priority, config.priority_order);
+      const pb = getPrioritySortIndex(b.priority, config.priority_order);
       return pa - pb;
     });