@wwkit/opm 1.0.18 → 1.0.20

package/src/tools/share/server.js

@@ -219,6 +219,7 @@ async function handleUpload(req, res, dataDir, baseUrl) {
   }
 
   const id = parsed.id || genId()
+  const existed = fs.existsSync(path.join(dataDir, `${id}.json`))
   const item = {
     id,
     title: parsed.title || defaultTitle(content),
@@ -226,11 +227,12 @@ async function handleUpload(req, res, dataDir, baseUrl) {
     password: parsed.password || DEFAULT_PASSWORD,
     type: parsed.type || 'text',
     filename: parsed.filename || '',
+    sourcePath: parsed.sourcePath || '',
     created: new Date().toISOString(),
   }
 
   writeShare(dataDir, item)
-  sendJson(res, 200, { id, url: `${baseUrl}/share/${id}`, htmlUrl: `${baseUrl}/share/html/${id}` })
+  sendJson(res, 200, { id, url: `${baseUrl}/share/${id}`, htmlUrl: `${baseUrl}/share/html/${id}`, overwritten: existed })
 }
 
 function handleList(req, res, dataDir, url) {
@@ -269,7 +271,7 @@ function handleLatest(req, res, dataDir, pw) {
   }
   sendByAccept(
     req, res, 200,
-    { id: item.id, title: item.title, content: item.content, type: item.type || 'text', filename: item.filename || '', created: item.created },
+    { id: item.id, title: item.title, content: item.content, type: item.type || 'text', filename: item.filename || '', sourcePath: item.sourcePath || '', created: item.created },
     renderHtml(item),
   )
 }
@@ -286,7 +288,7 @@ function handleGet(req, res, dataDir, id, pw) {
   }
   sendByAccept(
     req, res, 200,
-    { id: item.id, title: item.title, content: item.content, type: item.type || 'text', filename: item.filename || '', created: item.created },
+    { id: item.id, title: item.title, content: item.content, type: item.type || 'text', filename: item.filename || '', sourcePath: item.sourcePath || '', created: item.created },
     renderHtml(item),
   )
 }
@@ -300,8 +302,18 @@ function handleDelete(req, res, dataDir, id) {
   sendJson(res, 200, { deleted: true, id })
 }
 
+/**
+ * 某毫秒时间戳所在「天」的本地零点（与 opencode clear 语义一致）
+ * @param {number} ts - epoch ms
+ * @returns {number}
+ */
+function startOfDayLocal(ts) {
+  const d = new Date(ts)
+  return new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime()
+}
+
 function handleClear(req, res, dataDir, url) {
-  const days = parseInt(url.searchParams.get('days') || '0', 10) || 0
+  const days = parseFloat(url.searchParams.get('days') || '0') || 0
   const keep = parseInt(url.searchParams.get('keep') || '0', 10) || 0
 
   let files = fs.readdirSync(dataDir)
@@ -315,7 +327,11 @@ function handleClear(req, res, dataDir, url) {
   const now = Date.now()
 
   if (days > 0) {
-    const cutoff = now - days * 24 * 60 * 60 * 1000
+    // 语义与 opencode clear 统一：保留最近 n 天（含今天）。
+    // 整数天对齐本地零点（删除 今天零点-(n-1)天 之前）；小数天 = 小时级滚动窗口（0.5 = 12h）
+    const cutoff = Number.isInteger(days)
+      ? startOfDayLocal(now) - (days - 1) * 86400000
+      : now - days * 86400000
     for (const f of files) {
       const createdMs = new Date(f.created).getTime()
       if (createdMs < cutoff) {

package/src/tools/webwork/index.js

@@ -33,7 +33,7 @@ const COMPONENTS = [
 
 const ACTIONS = {
   version:   { desc: 'Show installed version of each component' },
-  versions:  { desc: 'Show latest available versions (default 10, -n <num>)' },
+  versions:  { desc: 'Show latest available versions (default 10, -n <count>)' },
   installed: { desc: 'Show install status (true/false) of each component' },
   install:   { desc: 'Mirror check + ensure runtime + write registry env + blues-lib + ww init' },
   uninstall: { desc: 'Uninstall all components in reverse order' },
@@ -96,7 +96,7 @@ export class WebworkGroup {
 
   async _versions(parsed) {
     const proxy = this._resolveProxy(parsed)
-    const num = parseInt(parsed.flags.n || parsed.flags.num || '10', 10)
+    const num = parseInt(parsed.flags.n || parsed.flags.count || parsed.flags.num || '10', 10)
 
     const result = {}
 
@@ -274,6 +274,10 @@ export class WebworkGroup {
     await this._runBatch('uninstall', reversed, proxy, (key, p) => this._uninstallComponent(key, p))
   }
 
+  // TODO(P2-6): webwork 自身需要提供真正的 uninstall 命令。
+  // 当前 _uninstall 仅卸载 blues-lib（python/node 作为系统依赖跳过）；
+  // 自身的完整卸载方案（registry env 清理、ww 相关配置移除等）待实现。
+
   /**
    * 检查镜像可达性（HEAD 请求，不可达则抛错）
    * 必查：npm / pip（blues-lib 依赖，环境必然可用）