weaver-work-cli 0.1.23 → 0.1.25

package/dist/shortcuts/caizhilian/host.js

@@ -110,9 +110,13 @@ export function createCaizhilianHost(ctx, dependencies = {}) {
         });
     }
     async function doRequest(request, binary) {
-        const { method, path, query, body, operation, form, multipart, headers: extraHeaders = {}, timeoutMs = CAIZHILAN_TIMEOUT_MS, } = request;
+        const { method, path, query, body, operation, form, multipart, streamMultipart, maxResponseBytes, headers: extraHeaders = {}, timeoutMs = CAIZHILAN_TIMEOUT_MS, } = request;
         assertCaizhilianPath(path);
-        const resolvedMethod = method || (body === undefined && form === undefined && multipart === undefined ? 'GET' : 'POST');
+        const resolvedMethod = method || (body === undefined && form === undefined && multipart === undefined
+            && streamMultipart === undefined ? 'GET' : 'POST');
+        const headers = { 'X-Requested-With': 'XMLHttpRequest', ...extraHeaders, ...(streamMultipart ? {
+                'Content-Type': streamMultipart.contentType, 'Content-Length': String(streamMultipart.contentLength),
+            } : {}) };
         const rt = await runtime();
         const response = binary
             ? await rt.requestBinary({
@@ -124,7 +128,9 @@ export function createCaizhilianHost(ctx, dependencies = {}) {
                 body: multipart === undefined ? body : undefined,
                 form: multipart === undefined && form === undefined ? undefined : formBody(form ?? {}),
                 formData: multipart,
-                headers: { 'X-Requested-With': 'XMLHttpRequest', ...extraHeaders },
+                streamBody: streamMultipart?.body,
+                maxResponseBytes,
+                headers,
                 timeoutMs,
             })
             : await rt.requestJson({
@@ -136,7 +142,9 @@ export function createCaizhilianHost(ctx, dependencies = {}) {
                 body: multipart === undefined ? body : undefined,
                 form: multipart === undefined && form === undefined ? undefined : formBody(form ?? {}),
                 formData: multipart,
-                headers: { 'X-Requested-With': 'XMLHttpRequest', ...extraHeaders },
+                streamBody: streamMultipart?.body,
+                maxResponseBytes,
+                headers,
                 timeoutMs,
             });
         return response;
@@ -156,7 +164,7 @@ export function createCaizhilianHost(ctx, dependencies = {}) {
             }
             throw caizhilianNetworkError('protocol', `接口返回不是合法 JSON（HTTP ${response.status}）`, { retryable: false });
         }
-        if (response.status < 200 || response.status >= 300) {
+        if (response.status < 200 || response.status >= 300 || (request.requireHttp200 && response.status !== 200)) {
             throw new CaizhilianCliError('api', 'http_error', `采知连接口 HTTP ${response.status}`, {
                 code: response.status,
                 details: { status: response.status, message: caizhilianBusinessMessage(response.value) },

package/dist/shortcuts/caizhilian/operations/handlers/file-upload.js

@@ -1,192 +1,85 @@
-/**
- * caizhilian.file-upload — 文件上传（本地文件上传到文件服务）
- *
- * 覆盖本地文件上传到 E10 文件服务的完整流程：
- * - contract: 获取上传接口合约
- * - prepare: 本地文件校验与元数据准备
- * - upload: 上传文件并获取 fileId
- *
- * 接口：
- * - 预检查：POST /api/file/preUploadCheck?sf_request_type=ajax
- * - 上传：POST /api/file/module/upload?sf_request_type=ajax
- */
-import { CaizhilianCliError, caizhilianValidationError } from '../../errors.js';
-import { caizhilianSuccess } from '../types.js';
-import { requireNonEmpty } from '../shared.js';
-import { createHash } from 'node:crypto';
-import { readFileSync, statSync } from 'node:fs';
-import { basename, extname } from 'node:path';
-const ACTION = 'caizhilian.file-upload';
-// ── 接口路径 ──────────────────────────────────────────────
-const PRE_UPLOAD_CHECK_PATH = '/api/file/preUploadCheck?sf_request_type=ajax';
-const UPLOAD_PATH = '/api/file/module/upload?sf_request_type=ajax';
-// ── 辅助函数 ──────────────────────────────────────────────
-function asRecord(value) {
-    return value && typeof value === 'object' && !Array.isArray(value) ? value : {};
+/** Weaver file upload integrated with the existing CLI confirmation and authentication boundary. */
+import { caizhilianConfirmationError, caizhilianValidationError } from '../../errors.js';
+import { inspectUploadFile, readUploadContext, RESERVED_CONTEXT_FIELDS, uploadChatId, uploadModule, uploadTimeout } from '../../file-upload/metadata.js';
+import { uploadToFileService } from '../../file-upload/protocol.js';
+import { writeUploadReceipt } from '../../file-upload/receipt.js';
+import { issueWriteLease } from '../confirm.js';
+import { caizhilianPrepared, caizhilianSuccess } from '../types.js';
+const PREFIX = 'caizhilian.file-upload';
+const COMMAND = 'weaver-work-cli --json caizhilian run';
+const CONTEXT_PURPOSES = {
+    source: '上传来源场景', fieldId: '附件字段或控件 ID', sourceRefId: '来源业务对象引用 ID',
+    authModule: '服务端权限校验模块', customParam: '模块扩展参数', refId: '最终关联对象 ID',
+    commonText: '通用场景参数', folderId: '目标文件夹 ID',
+};
+async function getContract() {
+    return caizhilianSuccess(`${PREFIX}.contract`, { contract: {
+            version: 'agent_callable_interface_contract.v1', authentication: 'weaver-work-cli', automatic_fallback: false,
+            upload_strategies: ['second', 'common', 'chunk'],
+            actions: ['contract', 'prepare', 'upload.prepare', 'upload.apply'],
+            canonical_commands: ['contract', 'prepare', 'upload.prepare', 'upload.apply'].map((name) => `${COMMAND} ${PREFIX}.${name}${name === 'contract' ? '' : ' --input-json <businessInputJson>'}`
+                + (name === 'upload.apply' ? ' --continuation <token> --yes' : '')),
+            required: { prepare: ['file_path', 'module'], 'upload.prepare': ['file_path', 'module', 'user_confirmed'],
+                'upload.apply': ['file_path', 'module', 'user_confirmed', 'continuation', 'confirm'] },
+            optional: { prepare: ['context_file', 'chat_id', 'timeout_seconds'],
+                'upload.prepare': ['context_file', 'chat_id', 'timeout_seconds'],
+                'upload.apply': ['context_file', 'chat_id', 'timeout_seconds'] },
+            user_input_guide: { required: [
+                    { name: 'file_path', purpose: '需要上传的本地普通文件绝对路径，直接复用宿主附件路径' },
+                    { name: 'module', purpose: '真实业务模块；不得猜测或使用默认模块' },
+                ], conditionally_required: [], optional: [
+                    { name: 'context_file', purpose: '可选业务上下文 JSON 文件绝对路径，最多 64 KiB' },
+                    { name: 'chat_id', purpose: '隔离对话回执；默认 cli，由宿主注入' },
+                    { name: 'timeout_seconds', purpose: '上传请求及响应读取超时（1–3600 秒，默认 300）' },
+                    ...Object.entries(CONTEXT_PURPOSES).map(([name, purpose]) => ({ name: `context_file.${name}`, purpose })),
+                ] }, reserved_context_fields: RESERVED_CONTEXT_FIELDS,
+            success_evidence: ['business_verified', 'file.file_id', 'receipt_ref', 'receipt_sha256'],
+            login: '登录由 weaver-work-cli auth 托管，本模块不读取其他 Skill 登录态或启动独立浏览器',
+        } });
 }
-function isPlainObject(value) {
-    return typeof value === 'object' && value !== null && !Array.isArray(value);
+function requireUploadAuthorization(args) {
+    if (args.user_confirmed !== true) {
+        throw caizhilianConfirmationError(`${PREFIX}.upload`, { hint: '上传必须来自当前用户明确授权，并传 user_confirmed=true' });
+    }
 }
-function md5File(filePath) {
-    const content = readFileSync(filePath);
-    return createHash('md5').update(content).digest('hex');
+async function inspect(args) {
+    const module = uploadModule(args.module);
+    const chatId = uploadChatId(args.chat_id);
+    const timeoutMs = uploadTimeout(args.timeout_seconds);
+    const context = await readUploadContext(args.context_file);
+    const file = await inspectUploadFile(args.file_path);
+    return { file, context, module, chatId, timeoutMs };
 }
-function sha256File(filePath) {
-    const content = readFileSync(filePath);
-    return createHash('sha256').update(content).digest('hex');
+function metadataPreview(prepared) {
+    const { file, context, module, chatId } = prepared;
+    return { file_path: file.path, file_name: file.name, ext: file.extension, size: file.size,
+        md5: file.md5, sha256: file.sha256, module, chat_id: chatId, context_keys: context.keys,
+        context_sha256: context.sha256 };
 }
-// ── 获取上传合约 ──────────────────────────────────────────
-async function getContract(args, env) {
-    return caizhilianSuccess(ACTION, {
-        contract: {
-            version: 'agent_callable_interface_contract.v1',
-            actions: ['contract', 'prepare', 'upload'],
-            required: {
-                prepare: ['file_path', 'module'],
-                upload: ['file_path', 'module', 'user_confirmed'],
-            },
-            optional: {
-                prepare: ['context_file'],
-                upload: ['context_file', 'login_mode'],
-            },
-        },
-    });
+async function prepareLocal(args) {
+    return caizhilianSuccess(`${PREFIX}.prepare`, metadataPreview(await inspect(args)));
 }
-// ── 准备上传（prepare/apply）──────────────────────────────────────
 async function prepareUpload(args, env) {
-    const filePath = requireNonEmpty(args.file_path, 'file_path');
-    const module = requireNonEmpty(args.module, 'module');
-    // 校验文件存在
-    let stat;
-    try {
-        stat = statSync(filePath);
-    }
-    catch (error) {
-        throw caizhilianValidationError('file_not_found', `文件不存在: ${filePath}`);
-    }
-    if (!stat.isFile()) {
-        throw caizhilianValidationError('file_not_regular', `不是普通文件: ${filePath}`);
-    }
-    // 计算元数据
-    const fileName = basename(filePath);
-    const ext = extname(filePath).slice(1).toLowerCase();
-    const size = stat.size;
-    const md5 = md5File(filePath);
-    const sha256 = sha256File(filePath);
-    // 签发 continuation
-    const continuation = await env.continuation.issue({
-        operation: 'caizhilian.file-upload.upload.apply',
-        filePath,
-        module,
-        fileName,
-        ext,
-        size,
-        md5,
-        sha256,
-    });
-    return caizhilianSuccess('caizhilian.file-upload.prepare', {
-        file_path: filePath,
-        file_name: fileName,
-        ext,
-        size,
-        md5,
-        sha256,
-        module,
-        continuation,
-    });
+    const prepared = await inspect(args);
+    const lease = await issueWriteLease(env, `${PREFIX}.upload.apply`, args, { file_path: prepared.file.path,
+        module: prepared.module, file: prepared.file, context_sha256: prepared.context.sha256 });
+    return caizhilianPrepared(`${PREFIX}.upload.prepare`, metadataPreview(prepared), lease);
 }
 async function uploadApply(args, env, lease) {
-    const filePath = lease.payload?.filePath;
-    const module = lease.payload?.module;
-    const fileName = lease.payload?.fileName;
-    const ext = lease.payload?.ext;
-    const size = lease.payload?.size;
-    const md5 = lease.payload?.md5;
-    const sha256 = lease.payload?.sha256;
-    // 预检查
-    const preCheckResponse = await env.host.request({
-        method: 'POST',
-        path: PRE_UPLOAD_CHECK_PATH,
-        body: {
-            fileName,
-            fileSize: size,
-            module,
-            md5,
-        },
-        operation: 'caizhilian.file-upload.upload.apply',
-    });
-    const preCheckData = asRecord(preCheckResponse);
-    if (!preCheckData.status && !preCheckData.success) {
-        throw new CaizhilianCliError('api', 'business_error', String(preCheckData.msg || preCheckData.message || '预检查失败'), {
-            code: preCheckData.code ?? preCheckData.status,
-            details: { action: 'caizhilian.file-upload.upload.apply', message: String(preCheckData.msg || preCheckData.message || '预检查失败') },
-            exitCode: 1,
-        });
-    }
-    const preCheckResult = asRecord(preCheckData.data);
-    // 判断上传策略
-    const uploadType = preCheckResult.uploadType || 'common';
-    const preUploadId = preCheckResult.preUploadId;
-    // 如果是 second 策略，直接返回已有 file ID
-    if (uploadType === 'second') {
-        const fileId = preCheckResult.fileId || preCheckResult.fileid || preCheckResult.uploadModuleDto?.fileObj?.fileId;
-        if (!fileId) {
-            throw new CaizhilianCliError('api', 'business_error', 'second 策略未返回 file ID', {
-                details: { action: 'caizhilian.file-upload.upload.apply' },
-                exitCode: 1,
-            });
-        }
-        return caizhilianSuccess('caizhilian.file-upload.upload.apply', {
-            file_id: String(fileId),
-            file_name: fileName,
-            size,
-            ext,
-            upload_type: uploadType,
-        });
-    }
-    // common/chunk 策略：上传文件
-    const fileContent = readFileSync(filePath);
-    const formData = new FormData();
-    formData.append('file', new Blob([fileContent]), fileName);
-    formData.append('preUploadId', preUploadId || '');
-    formData.append('module', module);
-    const uploadResponse = await env.host.request({
-        method: 'POST',
-        path: UPLOAD_PATH,
-        body: formData,
-        operation: 'caizhilian.file-upload.upload.apply',
-    });
-    const uploadData = asRecord(uploadResponse);
-    if (!uploadData.status && !uploadData.success) {
-        throw new CaizhilianCliError('api', 'business_error', String(uploadData.msg || uploadData.message || '上传失败'), {
-            code: uploadData.code ?? uploadData.status,
-            details: { action: 'caizhilian.file-upload.upload.apply', message: String(uploadData.msg || uploadData.message || '上传失败') },
-            exitCode: 1,
-        });
+    const prepared = await inspect(args);
+    if (prepared.file.sha256 !== lease.file?.sha256 || prepared.file.size !== lease.file?.size) {
+        throw caizhilianValidationError('file_changed', '文件与已确认内容不一致，请重新准备上传');
     }
-    const uploadResult = asRecord(uploadData.data);
-    const fileId = uploadResult.fileId || uploadResult.fileid || '';
-    if (!fileId) {
-        throw new CaizhilianCliError('api', 'business_error', '上传未返回 file ID', {
-            details: { action: 'caizhilian.file-upload.upload.apply' },
-            exitCode: 1,
-        });
+    if (prepared.context.sha256 !== lease.context_sha256) {
+        throw caizhilianValidationError('context_changed', '业务上下文与已确认内容不一致，请重新准备上传');
     }
-    return caizhilianSuccess('caizhilian.file-upload.upload.apply', {
-        file_id: String(fileId),
-        file_name: fileName,
-        size,
-        ext,
-        upload_type: uploadType,
-    });
+    const verified = await uploadToFileService(env.host, prepared.file, prepared.module, prepared.context, prepared.timeoutMs);
+    const result = await writeUploadReceipt(env, prepared.chatId, prepared.module, prepared.file, prepared.context, verified);
+    return caizhilianSuccess(`${PREFIX}.upload.apply`, result);
 }
-// ── 处理器汇总 ────────────────────────────────────────────
 export const caizhilianFileUploadHandlers = {
-    'caizhilian.file-upload.contract': { execute: getContract },
-    'caizhilian.file-upload.prepare': { execute: prepareUpload },
-    'caizhilian.file-upload.upload': {
-        prepare: prepareUpload,
-        apply: uploadApply,
-        targetKeys: ['file_path', 'module'],
-    },
+    [`${PREFIX}.contract`]: { execute: getContract },
+    [`${PREFIX}.prepare`]: { execute: prepareLocal },
+    [`${PREFIX}.upload`]: { validateInput: requireUploadAuthorization, prepare: prepareUpload,
+        apply: uploadApply, targetKeys: ['file_path', 'module'] },
 };

package/dist/shortcuts/caizhilian/operations/handlers/fileops.js

@@ -3,7 +3,7 @@ import { caizhilianValidationError } from '../../errors.js';
 import { updateDocBasicField } from '../api.js';
 import { issueWriteLease } from '../confirm.js';
 import { IMAGE_ALLOWED_EXT, assertAllowedExt, assertFileUnchanged, downloadAttachment, readFileMetadata, resolveSavePathArg, uploadFileToServer, } from '../files.js';
-import { fingerprint, isPlainObject, pyBool, timestampToDateStr, validateRequiredParams } from '../shared.js';
+import { fingerprint, formatVersionTimestamp, isPlainObject, pyBool, timestampToDateStr, validateRequiredParams, } from '../shared.js';
 import { caizhilianPrepared, caizhilianSuccess } from '../types.js';
 /**
  * 文件域操作（1:1 对应源 scripts/document_plugins.py 的附件/封面部分
@@ -32,6 +32,8 @@ const QUERY_FILE_OBJECTS_PATH = '/api/file/queryFileObjects';
 const COMPARE_SUBMIT_PATH = '/api/docCompare/uploadCompared';
 const TO_PDF_CHECK_PATH = '/api/file/download/toPdf';
 const DOC_UPDATE_PATH = '/api/doc/document/update';
+/** 源 filePreview 页「附件历史版本」抽屉接口（抓包 findVersionList）。 */
+const FIND_VERSION_LIST_PATH = '/api/file/base/upload/findVersionList';
 /** 源 doc_compare_plugins._COMPARE_OPTIONS：13 个比对选项全部固定为 0（键序与源一致）。 */
 const COMPARE_OPTIONS = {
     ignoreImages: 0,
@@ -50,6 +52,7 @@ const COMPARE_OPTIONS = {
 };
 const ATTACHMENT_UPLOAD_APPLY = 'caizhilian.attachment.upload.apply';
 const ATTACHMENT_REPLACE_APPLY = 'caizhilian.attachment.replace.apply';
+const ATTACHMENT_VERSIONS_ACTION = 'caizhilian.attachment.list-versions';
 const COVER_UPLOAD_APPLY = 'caizhilian.cover.upload.apply';
 const COVER_SET_APPLY = 'caizhilian.cover.set.apply';
 const COVER_REMOVE_APPLY = 'caizhilian.cover.remove.apply';
@@ -455,6 +458,68 @@ async function listFileObjectsHandler(args, env) {
     }
     return caizhilianSuccess(LIST_FILE_OBJECTS_ACTION, { attachments }, { doc_id: docId });
 }
+// ── caizhilian.attachment.list-versions ───────────────────
+/** 源 filePreview 页「附件历史版本」抽屉请求体（抓包 findVersionList，逐字段一致）。 */
+function buildFindVersionListBody(attachmentId, docId, pageNo, pageSize) {
+    return {
+        pageNo,
+        pageSize,
+        id: attachmentId,
+        docId,
+        startTime: '',
+        endTime: '',
+        userIds: '',
+        pauuid: randomUUID().replace(/-/gu, ''),
+        endType: process.platform === 'win32' ? 'Windows' : process.platform === 'darwin' ? 'Mac' : '',
+        module: 'document',
+        maxUploadSize: '10000',
+        mobile: false,
+        enterprisePan: false,
+        customParam: FROM_PC_DOC_PARAM,
+        authModule: 'document',
+        notLoggedIn: false,
+        autoSelect: false,
+        coordinateFlag: false,
+        deepClean: false,
+        publicFileHost: '',
+        tempFileType: '1',
+        create: false,
+        batchCollaboration: false,
+        fileId: attachmentId,
+        imgType: 'imgPlug',
+    };
+}
+async function listAttachmentVersionsHandler(args, env) {
+    const action = ATTACHMENT_VERSIONS_ACTION;
+    validateRequiredParams(args, ['attachment_id']);
+    const attachmentId = pyArgStripped(args, 'attachment_id');
+    const docId = pyArgStripped(args, 'doc_id');
+    const pageNo = Number(args.page_no ?? 1);
+    const pageSize = Number(args.page_size ?? 10);
+    const response = await env.host.request({
+        method: 'POST',
+        path: FIND_VERSION_LIST_PATH,
+        body: buildFindVersionListBody(attachmentId, docId, pageNo, pageSize),
+        operation: action,
+    });
+    const rawPage = nestedValue(response, 'data', 'page');
+    const rawList = Array.isArray(nestedValue(rawPage, 'result')) ? nestedValue(rawPage, 'result') : [];
+    const hasNext = pyBool(nestedValue(rawPage, 'hasNext'));
+    const versions = [];
+    for (const item of rawList) {
+        if (!isPlainObject(item))
+            continue;
+        versions.push({
+            id: item.id ?? null,
+            name: item.name ?? null,
+            versionNumber: item.versionNumber ?? null,
+            updateTime: formatVersionTimestamp(item.updateTime),
+            describe: item.describe ?? null,
+            extName: item.extName ?? null,
+        });
+    }
+    return caizhilianSuccess(action, { versions, has_next: hasNext }, { attachment_id: attachmentId, doc_id: docId });
+}
 // ── caizhilian.compare.upload-file ────────────────────────
 /** 源 DocCompareUploadFilePlugin.execute 的入参解析。 */
 async function planCompareUpload(args) {
@@ -561,6 +626,7 @@ export const caizhilianFileopsHandlers = {
     'caizhilian.attachment.replace': attachmentReplaceHandler,
     'caizhilian.attachment.download': { execute: downloadAttachmentHandler },
     'caizhilian.attachment.download-as-pdf': { execute: downloadAsPdfHandler },
+    'caizhilian.attachment.list-versions': { execute: listAttachmentVersionsHandler },
     'caizhilian.cover.upload': coverUploadHandler,
     'caizhilian.cover.set': coverSetHandler,
     'caizhilian.cover.remove': coverRemoveHandler,