@lightcone-ai/daemon 0.14.10 → 0.14.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lightcone-ai/daemon",
-  "version": "0.14.10",
+  "version": "0.14.12",
   "type": "module",
   "main": "src/index.js",
   "bin": {

package/src/publish-job-runner.js

@@ -7,6 +7,7 @@ import { KuaishouAdapter } from '../mcp-servers/publisher/adapters/kuaishou.js';
 import { callOfficialTool } from '../mcp-servers/publisher/official-tool-client.js';
 import { runPublishPrecheck } from '../mcp-servers/publisher/precheck.js';
 import { withProfileLock } from './profile-lock.js';
+import { profileDir as getBrowserProfileDir } from './browser-login.js';
 
 const PLATFORM_ENV_KEYS = {
   xhs: 'XHS_PROFILE_DIR',
@@ -36,10 +37,53 @@ function asObject(value) {
   return {};
 }
 
-function getProfileDir(platform) {
-  const key = PLATFORM_ENV_KEYS[platform];
-  if (!key) return null;
-  return process.env[key] ?? null;
+export function resolveProfileDir(platform, { ownerId } = {}) {
+  const envKey = PLATFORM_ENV_KEYS[platform];
+  const envValue = normalizeText(envKey ? process.env[envKey] : null);
+  if (envValue) {
+    return {
+      profileDir: envValue,
+      source: 'env',
+      envKey,
+      ownerId: normalizeText(ownerId),
+    };
+  }
+
+  const normalizedOwnerId = normalizeText(ownerId);
+  if (normalizedOwnerId) {
+    return {
+      profileDir: getBrowserProfileDir(platform, normalizedOwnerId),
+      source: 'owner',
+      envKey,
+      ownerId: normalizedOwnerId,
+    };
+  }
+
+  return {
+    profileDir: null,
+    source: 'missing_owner',
+    envKey,
+    ownerId: null,
+  };
+}
+
+export function resolveExistingProfileDir(platform, { ownerId } = {}) {
+  const resolved = resolveProfileDir(platform, { ownerId });
+  if (!resolved.profileDir) {
+    throw new Error('publish:job missing owner_id; server must include it for cross-machine profile resolution');
+  }
+
+  if (!existsSync(resolved.profileDir)) {
+    if (resolved.source === 'env') {
+      throw new Error(`Profile dir from ${resolved.envKey} not found: ${resolved.profileDir}`);
+    }
+    throw new Error(
+      `Profile dir for ${platform} not found at ${resolved.profileDir}; ` +
+      'user must complete browser-login on this machine first'
+    );
+  }
+
+  return resolved.profileDir;
 }
 
 function getAdapterClass(platform) {
@@ -53,22 +97,16 @@ function createStaticAdapter(platform) {
   return new AdapterClass(null);
 }
 
-async function getAdapter(platform) {
-  const profileDir = getProfileDir(platform);
-  if (!profileDir) {
-    throw new Error(`No profile dir for platform="${platform}". Has the user logged in and authorized this machine?`);
-  }
-  const cdp = await getSession(platform, profileDir);
+async function getAdapter(platform, { ownerId } = {}) {
+  const resolvedProfileDir = resolveExistingProfileDir(platform, { ownerId });
+  const cdp = await getSession(platform, resolvedProfileDir);
   const AdapterClass = getAdapterClass(platform);
   return new AdapterClass(cdp);
 }
 
-async function withPublisherProfile(platform, fn) {
-  const profileDir = getProfileDir(platform);
-  if (!profileDir) {
-    throw new Error(`No profile dir for platform="${platform}". Has the user logged in and authorized this machine?`);
-  }
-  return withProfileLock(platform, profileDir, {
+async function withPublisherProfile(platform, { ownerId } = {}, fn) {
+  const resolvedProfileDir = resolveExistingProfileDir(platform, { ownerId });
+  return withProfileLock(platform, resolvedProfileDir, {
     owner: `publisher:${platform}`,
     timeoutMs: 30_000,
     staleMs: 20 * 60 * 1000,
@@ -92,19 +130,20 @@ function decodeWorkspaceContent(content) {
   return Buffer.from(decodeURIComponent(body), 'utf8');
 }
 
-async function internalApi({ serverUrl, machineApiKey, agentId, method, endpoint, body }) {
-  const url = `${String(serverUrl).replace(/\/$/, '')}/internal/agent/${encodeURIComponent(agentId)}${endpoint}`;
+export async function fetchPublishJobWorkspaceFile({ serverUrl, machineApiKey, jobId, relPath }) {
+  const normalizedJobId = String(jobId ?? '').trim();
+  if (!normalizedJobId) {
+    throw new Error('publish job id is required to fetch workspace files');
+  }
+  const url = `${String(serverUrl).replace(/\/$/, '')}/internal/agent/publish-jobs/${encodeURIComponent(normalizedJobId)}/workspace-files?path=${encodeURIComponent(relPath)}`;
   const res = await fetch(url, {
-    method,
     headers: {
-      'Content-Type': 'application/json',
       Authorization: `Bearer ${machineApiKey}`,
     },
-    body: body != null ? JSON.stringify(body) : undefined,
   });
   if (!res.ok) {
     const text = await res.text();
-    throw new Error(`internal API ${method} ${endpoint} failed (${res.status}): ${text}`);
+    throw new Error(`publish-jobs workspace-files GET failed (${res.status}): ${text}`);
   }
   return res.json();
 }
@@ -135,7 +174,15 @@ export function workspacePathFromMediaPath(filePath, workspaceId) {
   return null;
 }
 
-async function materializeWorkspaceMedia({ filePath, workspaceId, workspaceRootDir, serverUrl, machineApiKey, agentId }) {
+export async function materializeWorkspaceMedia({
+  filePath,
+  workspaceId,
+  workspaceRootDir,
+  serverUrl,
+  machineApiKey,
+  jobId,
+  fetchWorkspaceFile = fetchPublishJobWorkspaceFile,
+}) {
   if (!filePath || existsSync(filePath)) return filePath;
 
   const workspacePath = workspacePathFromMediaPath(filePath, workspaceId);
@@ -149,12 +196,11 @@ async function materializeWorkspaceMedia({ filePath, workspaceId, workspaceRootD
 
   if (existsSync(localPath)) return localPath;
 
-  const data = await internalApi({
+  const data = await fetchWorkspaceFile({
     serverUrl,
     machineApiKey,
-    agentId,
-    method: 'GET',
-    endpoint: `/workspace-memory?path=${encodeURIComponent(workspacePath.relPath)}&workspaceId=${encodeURIComponent(workspacePath.workspaceId)}`,
+    jobId,
+    relPath: workspacePath.relPath,
   });
   mkdirSync(path.dirname(localPath), { recursive: true });
   writeFileSync(localPath, decodeWorkspaceContent(data.content));
@@ -169,7 +215,7 @@ async function materializeMedia({
   workspaceRootDir,
   serverUrl,
   machineApiKey,
-  agentId,
+  jobId,
 }) {
   return {
     images: await Promise.all(images.map(filePath => materializeWorkspaceMedia({
@@ -178,7 +224,7 @@ async function materializeMedia({
       workspaceRootDir,
       serverUrl,
       machineApiKey,
-      agentId,
+      jobId,
     }))),
     video: video ? await materializeWorkspaceMedia({
       filePath: video,
@@ -186,7 +232,7 @@ async function materializeMedia({
       workspaceRootDir,
       serverUrl,
       machineApiKey,
-      agentId,
+      jobId,
     }) : video,
     cover: cover ? await materializeWorkspaceMedia({
       filePath: cover,
@@ -194,7 +240,7 @@ async function materializeMedia({
       workspaceRootDir,
       serverUrl,
       machineApiKey,
-      agentId,
+      jobId,
     }) : cover,
   };
 }
@@ -360,6 +406,7 @@ export async function runPublishJob({ serverUrl, machineApiKey, agentId, workspa
     video,
     cover,
   } = buildJobInput(job);
+  const ownerId = normalizeText(job?.owner_id ?? job?.ownerId);
 
   if (!platform) throw new Error('publish job missing platform');
   if (!contentType) throw new Error('publish job missing content_type');
@@ -404,7 +451,7 @@ export async function runPublishJob({ serverUrl, machineApiKey, agentId, workspa
     workspaceRootDir,
     serverUrl,
     machineApiKey,
-    agentId,
+    jobId: job?.id,
   });
   const staticAdapter = createStaticAdapter(platform);
   const req = staticAdapter.getRequirements(contentType);
@@ -420,8 +467,8 @@ export async function runPublishJob({ serverUrl, machineApiKey, agentId, workspa
   });
 
   try {
-    const { publishResult, healthCheck } = await withPublisherProfile(platform, async () => {
-      const adapter = await getAdapter(platform);
+    const { publishResult, healthCheck } = await withPublisherProfile(platform, { ownerId }, async () => {
+      const adapter = await getAdapter(platform, { ownerId });
       const prePublishLogin = await adapter.checkLoginStatus();
       if (prePublishLogin?.loggedIn === false) {
         throw new Error(`LOGIN_EXPIRED:${platform}`);