team-toon-tack 1.0.7 → 1.0.9

package/package.json

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

package/scripts/done-job.ts

@@ -1,6 +1,6 @@
 import prompts from 'prompts';
 import { execSync } from 'node:child_process';
-import { getLinearClient, loadConfig, loadCycleData, saveCycleData, getTeamId, getDefaultTeamKey } from './utils';
+import { getLinearClient, loadConfig, loadLocalConfig, loadCycleData, saveCycleData, getTeamId, getDefaultTeamKey } from './utils';
 
 interface CommitInfo {
   shortHash: string;
@@ -86,6 +86,7 @@ Examples:
   let issueId = argIssueId;
 
   const config = await loadConfig();
+  const localConfig = await loadLocalConfig();
   const data = await loadCycleData();
 
   if (!data) {
@@ -163,7 +164,7 @@ Examples:
     try {
       const client = getLinearClient();
       const workflowStates = await client.workflowStates({
-        filter: { team: { id: { eq: getTeamId(config) } } }
+        filter: { team: { id: { eq: getTeamId(config, localConfig.team) } } }
       });
       const doneState = workflowStates.nodes.find(s => s.name === 'Done');
 

package/scripts/init.ts

@@ -177,12 +177,8 @@ async function init() {
   });
   const states = statesData.nodes;
 
-  // Fetch current cycle
-  const cyclesData = await selectedTeam.cycles({
-    filter: { isActive: { eq: true } },
-    first: 1
-  });
-  const currentCycle = cyclesData.nodes[0];
+  // Fetch current cycle using activeCycle (direct and accurate)
+  const currentCycle = await selectedTeam.activeCycle;
 
   // Select current user
   let currentUser = users[0];
@@ -280,7 +276,7 @@ async function init() {
     priority_order: ['urgent', 'high', 'medium', 'low', 'none'],
     current_cycle: currentCycle ? {
       id: currentCycle.id,
-      name: currentCycle.name || 'Cycle',
+      name: currentCycle.name || `Cycle #${currentCycle.number}`,
       start_date: currentCycle.startsAt?.toISOString().split('T')[0] || '',
       end_date: currentCycle.endsAt?.toISOString().split('T')[0] || ''
     } : undefined,
@@ -292,8 +288,14 @@ async function init() {
     ([_, u]) => u.id === currentUser.id
   )?.[0] || 'user';
 
+  // Find selected team key
+  const selectedTeamKey = Object.entries(teamsConfig).find(
+    ([_, t]) => t.id === selectedTeam.id
+  )?.[0] || Object.keys(teamsConfig)[0];
+
   const localConfig: LocalConfig = {
     current_user: currentUserKey,
+    team: selectedTeamKey,
     label: defaultLabel
   };
 
@@ -342,6 +344,7 @@ async function init() {
 
       // Preserve existing values
       if (existingLocal.current_user) localConfig.current_user = existingLocal.current_user;
+      if (existingLocal.team) localConfig.team = existingLocal.team;
       if (existingLocal.label) localConfig.label = existingLocal.label;
       if (existingLocal.exclude_assignees) localConfig.exclude_assignees = existingLocal.exclude_assignees;
     } catch {
@@ -359,7 +362,7 @@ async function init() {
   console.log(`  User: ${currentUser.displayName || currentUser.name} (${currentUser.email})`);
   console.log(`  Label: ${defaultLabel}`);
   if (currentCycle) {
-    console.log(`  Cycle: ${currentCycle.name}`);
+    console.log(`  Cycle: ${currentCycle.name || `Cycle #${currentCycle.number}`}`);
   }
 
   console.log('\nNext steps:');

package/scripts/sync.ts

@@ -24,7 +24,7 @@ Examples:
   const config = await loadConfig();
   const localConfig = await loadLocalConfig();
   const client = getLinearClient();
-  const teamId = getTeamId(config);
+  const teamId = getTeamId(config, localConfig.team);
 
   // Build excluded emails from local config
   const excludedEmails = new Set(
@@ -33,22 +33,18 @@ Examples:
       .filter(Boolean)
   );
 
-  // Phase 1: Fetch and update latest active cycle
+  // Phase 1: Fetch active cycle directly from team
   console.log('Fetching latest cycle...');
   const team = await client.team(teamId);
-  const cycles = await team.cycles({
-    filter: { isActive: { eq: true } },
-    first: 1
-  });
+  const activeCycle = await team.activeCycle;
 
-  if (cycles.nodes.length === 0) {
+  if (!activeCycle) {
     console.error('No active cycle found.');
     process.exit(1);
   }
 
-  const activeCycle = cycles.nodes[0];
   const cycleId = activeCycle.id;
-  const cycleName = activeCycle.name ?? 'Cycle';
+  const cycleName = activeCycle.name ?? `Cycle #${activeCycle.number}`;
   const newCycleInfo: CycleInfo = {
     id: cycleId,
     name: cycleName,

package/scripts/utils.ts

@@ -130,6 +130,7 @@ export interface CycleData {
 
 export interface LocalConfig {
   current_user: string;
+  team: string;  // team key from config.teams
   exclude_assignees?: string[];
   label?: string;
 }

package/scripts/work-on.ts

@@ -120,7 +120,7 @@ Examples:
       try {
         const client = getLinearClient();
         const workflowStates = await client.workflowStates({
-          filter: { team: { id: { eq: getTeamId(config) } } }
+          filter: { team: { id: { eq: getTeamId(config, localConfig.team) } } }
         });
         const inProgressState = workflowStates.nodes.find(s => s.name === 'In Progress');