scene-capability-engine 3.6.65 → 3.6.67

package/lib/commands/task.js

@@ -42,6 +42,105 @@ function resolveStudioStageFromTaskKey(taskKey) {
   return normalizeString(normalized.slice('studio:'.length));
 }
 
+function readProjectChannelBinding(binding) {
+  if (!binding || typeof binding !== 'object') {
+    return null;
+  }
+
+  const projectChannel = {
+    project_id: normalizeString(binding.project_id) || null,
+    channel_id: normalizeString(binding.channel_id) || null,
+    focused_channel_id: normalizeString(binding.focused_channel_id) || null,
+    active_session_path: normalizeString(binding.active_session_path) || null,
+    active_scene: normalizeString(binding.active_scene) || null,
+    active_spec_id: normalizeString(binding.active_spec_id) || null,
+    active_doc: normalizeString(binding.active_doc) || null
+  };
+
+  if (!projectChannel.project_id && !projectChannel.channel_id) {
+    return null;
+  }
+
+  return projectChannel;
+}
+
+function resolveStudioProjectChannel(options = {}, lookup = {}, job = {}) {
+  const lookupMetadata = lookup && typeof lookup.metadata === 'object' && lookup.metadata
+    ? lookup.metadata
+    : {};
+  const lookupBinding = readProjectChannelBinding(lookupMetadata.project_channel);
+  const jobBinding = readProjectChannelBinding(job && job.session ? job.session.project_channel : null);
+
+  const projectChannel = {
+    project_id: normalizeString(options.projectId)
+      || normalizeString(options.project_id)
+      || (jobBinding ? jobBinding.project_id : '')
+      || (lookupBinding ? lookupBinding.project_id : '')
+      || normalizeString(lookupMetadata.project_id)
+      || null,
+    channel_id: normalizeString(options.collabChannel)
+      || normalizeString(options.collab_channel)
+      || normalizeString(options.channelId)
+      || normalizeString(options.channel_id)
+      || (jobBinding ? jobBinding.channel_id : '')
+      || (lookupBinding ? lookupBinding.channel_id : '')
+      || normalizeString(lookupMetadata.channel_id)
+      || null,
+    focused_channel_id: (jobBinding ? jobBinding.focused_channel_id : '')
+      || (lookupBinding ? lookupBinding.focused_channel_id : '')
+      || null,
+    active_session_path: (jobBinding ? jobBinding.active_session_path : '')
+      || (lookupBinding ? lookupBinding.active_session_path : '')
+      || null,
+    active_scene: (jobBinding ? jobBinding.active_scene : '')
+      || (lookupBinding ? lookupBinding.active_scene : '')
+      || null,
+    active_spec_id: (jobBinding ? jobBinding.active_spec_id : '')
+      || (lookupBinding ? lookupBinding.active_spec_id : '')
+      || null,
+    active_doc: (jobBinding ? jobBinding.active_doc : '')
+      || (lookupBinding ? lookupBinding.active_doc : '')
+      || null
+  };
+
+  if (!projectChannel.project_id && !projectChannel.channel_id) {
+    return null;
+  }
+
+  return projectChannel;
+}
+
+function studioJobMatchesProjectChannel(job = {}, projectChannel = null) {
+  if (!projectChannel) {
+    return true;
+  }
+
+  const jobProjectChannel = readProjectChannelBinding(job && job.session ? job.session.project_channel : null);
+  if (!jobProjectChannel) {
+    return false;
+  }
+
+  if (projectChannel.project_id && jobProjectChannel.project_id !== projectChannel.project_id) {
+    return false;
+  }
+  if (projectChannel.channel_id && jobProjectChannel.channel_id !== projectChannel.channel_id) {
+    return false;
+  }
+
+  return true;
+}
+
+function hasExplicitStudioProjectChannelOverride(options = {}) {
+  return Boolean(
+    normalizeString(options.projectId)
+    || normalizeString(options.project_id)
+    || normalizeString(options.collabChannel)
+    || normalizeString(options.collab_channel)
+    || normalizeString(options.channelId)
+    || normalizeString(options.channel_id)
+  );
+}
+
 async function runTaskDraftCommand(options = {}) {
   const projectPath = process.cwd();
   const sceneId = normalizeString(options.scene);
@@ -325,14 +424,19 @@ async function readLatestStudioJobId(projectPath, fileSystem = fs) {
   }
 }
 
-async function findLatestStudioJob(projectPath, sceneId, specId, fileSystem = fs) {
+async function findLatestStudioJob(projectPath, sceneId, specId, filters = {}, fileSystem = fs) {
+  const projectChannel = readProjectChannelBinding(filters);
   const latestJobId = await readLatestStudioJobId(projectPath, fileSystem);
   if (latestJobId) {
     const latestJob = await loadStudioJob(projectPath, latestJobId, fileSystem);
     if (latestJob) {
       const latestScene = normalizeString(latestJob?.scene?.id);
       const latestSpec = normalizeString(latestJob?.scene?.spec_id) || normalizeString(latestJob?.source?.spec_id);
-      if (latestScene === normalizeString(sceneId) && latestSpec === normalizeString(specId)) {
+      if (
+        latestScene === normalizeString(sceneId)
+        && latestSpec === normalizeString(specId)
+        && studioJobMatchesProjectChannel(latestJob, projectChannel)
+      ) {
         return latestJob;
       }
     }
@@ -355,7 +459,11 @@ async function findLatestStudioJob(projectPath, sceneId, specId, fileSystem = fs
       const payload = await fileSystem.readJson(absolutePath);
       const payloadScene = normalizeString(payload?.scene?.id);
       const payloadSpec = normalizeString(payload?.scene?.spec_id) || normalizeString(payload?.source?.spec_id);
-      if (payloadScene !== normalizeString(sceneId) || payloadSpec !== normalizeString(specId)) {
+      if (
+        payloadScene !== normalizeString(sceneId)
+        || payloadSpec !== normalizeString(specId)
+        || !studioJobMatchesProjectChannel(payload, projectChannel)
+      ) {
         continue;
       }
 
@@ -387,15 +495,22 @@ async function resolveStudioJobForRef(projectPath, lookup, options = {}, fileSys
     return explicitJob;
   }
 
+  const projectChannel = resolveStudioProjectChannel(options, lookup);
   const metaJobId = normalizeString(lookup?.metadata?.job_id);
   if (metaJobId) {
     const metaJob = await loadStudioJob(projectPath, metaJobId, fileSystem);
-    if (metaJob) {
+    if (metaJob && studioJobMatchesProjectChannel(metaJob, projectChannel)) {
       return metaJob;
     }
   }
 
-  const fallback = await findLatestStudioJob(projectPath, lookup.scene_id, lookup.spec_id, fileSystem);
+  const fallback = await findLatestStudioJob(
+    projectPath,
+    lookup.scene_id,
+    lookup.spec_id,
+    projectChannel || {},
+    fileSystem
+  );
   return fallback;
 }
 
@@ -403,6 +518,7 @@ function buildStudioRerunArgs(stage, lookup, job, options = {}) {
   const normalizedStage = normalizeString(stage);
   const sceneId = normalizeString(lookup.scene_id);
   const specId = normalizeString(lookup.spec_id);
+  const projectChannel = resolveStudioProjectChannel(options, lookup, job);
 
   if (normalizedStage === 'plan') {
     const fromChat = normalizeString(options.fromChat)
@@ -421,6 +537,12 @@ function buildStudioRerunArgs(stage, lookup, job, options = {}) {
     if (specId) {
       args.push('--spec', specId);
     }
+    if (projectChannel && projectChannel.project_id) {
+      args.push('--project-id', projectChannel.project_id);
+    }
+    if (projectChannel && projectChannel.channel_id) {
+      args.push('--collab-channel', projectChannel.channel_id);
+    }
     const goal = normalizeString(options.goal) || normalizeString(job?.source?.goal);
     if (goal) {
       args.push('--goal', goal);
@@ -440,7 +562,7 @@ function buildStudioRerunArgs(stage, lookup, job, options = {}) {
   const jobId = normalizeString(options.job)
     || normalizeString(options.jobId)
     || normalizeString(job?.job_id)
-    || normalizeString(lookup?.metadata?.job_id);
+    || (hasExplicitStudioProjectChannelOverride(options) ? '' : normalizeString(lookup?.metadata?.job_id));
 
   if (!jobId) {
     return {
@@ -587,11 +709,17 @@ async function runTaskShowCommand(options = {}, dependencies = {}) {
     const stage = resolveStudioStageFromTaskKey(lookup.task_key);
     const job = await resolveStudioJobForRef(projectPath, lookup, options, fileSystem);
     const rerunPlan = buildStudioRerunArgs(stage, lookup, job, options);
+    const projectChannel = resolveStudioProjectChannel(options, lookup, job);
+    const fallbackJobId = hasExplicitStudioProjectChannelOverride(options)
+      ? null
+      : normalizeString(lookup?.metadata?.job_id) || null;
     payload.task = {
       kind: 'studio-stage',
       stage,
-      job_id: normalizeString(job?.job_id) || normalizeString(lookup?.metadata?.job_id) || null
+      job_id: normalizeString(job?.job_id) || fallbackJobId,
+      project_channel: projectChannel
     };
+    payload.project_channel = projectChannel;
     if (rerunPlan.ok) {
       payload.rerun_command = stringifySceArgs(rerunPlan.args);
     }
@@ -655,6 +783,7 @@ async function runTaskRerunCommand(options = {}, dependencies = {}) {
     if (!rerunPlan.ok) {
       throw new Error(rerunPlan.error || 'Failed to build studio rerun command');
     }
+    const projectChannel = resolveStudioProjectChannel(options, lookup, job);
 
     const payload = {
       mode: 'task-rerun',
@@ -663,6 +792,7 @@ async function runTaskRerunCommand(options = {}, dependencies = {}) {
       rerun_type: 'studio-stage',
       stage,
       job_id: normalizeString(job?.job_id) || null,
+      project_channel: projectChannel,
       dry_run: dryRun,
       command: stringifySceArgs(rerunPlan.args),
       authorization: {
@@ -940,6 +1070,8 @@ function registerTaskCommands(program) {
     .requiredOption('--ref <task-ref>', 'Task reference (SS.PP.TT)')
     .option('--from-chat <session>', 'Override session for studio plan rerun hints')
     .option('--job <job-id>', 'Override studio job id for rerun hints')
+    .option('--project-id <project-id>', 'Override project scope for studio task resolution')
+    .option('--collab-channel <channel-id>', 'Override collaboration channel for studio task resolution')
     .option('--json', 'Print machine-readable JSON output')
     .action(async (options) => {
       try {
@@ -958,6 +1090,8 @@ function registerTaskCommands(program) {
     .option('--auth-lease <lease-id>', 'Write authorization lease id (sce auth grant)')
     .option('--from-chat <session>', 'Override session for studio plan rerun')
     .option('--job <job-id>', 'Override studio job id')
+    .option('--project-id <project-id>', 'Override project scope for studio task rerun')
+    .option('--collab-channel <channel-id>', 'Override collaboration channel for studio task rerun')
     .option('--profile <profile>', 'Override profile for studio verify/release rerun')
     .option('--channel <channel>', 'Override channel for studio release rerun')
     .option('--goal <goal>', 'Override goal for studio plan rerun')