From e27c023d66a61b73d3fe47e982daa6f34213c41f Mon Sep 17 00:00:00 2001 From: Anya Tokugawa Date: Sun, 8 Nov 2026 19:26:51 +0900 Subject: [PATCH] fix: explicitly recreate deleted task captures --- DISTRIBUTION.md | 4 +-- VERSION | 2 +- docs/neomutt.md | 22 +++++++++++++ pages | 25 +++++++++++++-- test_productivity.py | 68 ++++++++++++++++++++++++++++++++++++++++ test_task_integration.py | 14 +++++++++ tools/smoke_binary.py | 9 +++++- 7 files changed, 138 insertions(+), 6 deletions(-) diff --git a/DISTRIBUTION.md b/DISTRIBUTION.md index e992e21..0c3394d 100644 --- a/DISTRIBUTION.md +++ b/DISTRIBUTION.md @@ -18,8 +18,8 @@ rpm/debは初期配布の必須条件にせず、LinuxはELFを提供する。Py ```sh # ダウンロード先で実行。手元にあるファイルをチェックする。 -sha256sum --ignore-missing -c pages-cli-v0.4.1-linux-amd64-SHA256SUMS -tar -xzf pages-cli-v0.4.1-linux-amd64.tar.gz +sha256sum --ignore-missing -c pages-cli-v0.4.2-linux-amd64-SHA256SUMS +tar -xzf pages-cli-v0.4.2-linux-amd64.tar.gz mkdir -p ~/.local/bin install -m 755 pages ~/.local/bin/pages pages --version diff --git a/VERSION b/VERSION index 267577d..2b7c5ae 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.4.1 +0.4.2 diff --git a/docs/neomutt.md b/docs/neomutt.md index 5e255aa..98b6fe2 100644 --- a/docs/neomutt.md +++ b/docs/neomutt.md @@ -74,6 +74,28 @@ CLI v0.4.1以降では、同一内容の保留メールを再入力した場合 サーバーで保存された直後に応答が失われても、同じrequest_id・同じ内容で再送すれば既存タスクが返る。サーバー保存済みの要求と異なる内容で再送すると412になる。セッションファイルにはトークンと保留中のメール本文があるため、デバッグ目的で内容を貼り付けない。保存先未設定で失敗した場合は `pages task preferences --wiki-prefix /YOUR/MAIL/PATH` で設定してからretryする。 +### 削除済みタスクを再取り込みする + +CLI v0.4.2/PagesWiki v0.14.1以降の機能です。サーバーとCLIの両方の更新が必要で、CLI v0.4.1/PagesWiki v0.14.0では利用できません。 + +削除後も重複防止の受付記録は残ります。対応サーバーでは、内容の違いにかかわらず削除済み要求を410 `deleted` で拒否します。通常のretryで復活させず、保留下書きを使った再取り込みは次のように明示します。 + +```sh +pages task retry REQUEST_UUID --recreate-deleted +``` + +新しいUUIDのタスクを作成し、旧UUIDの削除記録とCalDAVの識別子予約は残します。同じ操作から生成されるUUIDは一定なので、応答が失われても重複作成しません。旧タスクの完了状態・作業記録・サブタスクを復元する操作ではありません。存続中のタスクをこのオプションで上書きすることもできません。 + +Wiki保存先にページが残っている場合は、本文・リビジョンを上書きせず新しいタスクに再リンクします。ページがなければ保留本文から作ります。本文の変更は通常のWiki編集で行ってください。保存先の現在権限が必要です。保存先は保持したsuffix/指定prefixと現在の既定値で決まり、移動された元ページを自動追跡する機能ではありません。 + +CLIは送信前に保留下書きを新IDへ移して保存し、`Retry ID:` に新IDを表示します。通信失敗後は新IDを使い、`--recreate-deleted` を付けずに再送します。 + +```sh +pages task retry NEW_REQUEST_UUID +``` + +元のメールを再入力するだけでは削除済みの状態を解除しません。受付記録はあるのにタスクと削除記録が両方ない場合は409 `capture_missing` となり、サーバー側の整合性調査が必要です。受付記録・削除記録を手動削除して回避しないでください。 + ## 計画と実績 ```sh diff --git a/pages b/pages index 2f0690d..2aa70fb 100755 --- a/pages +++ b/pages @@ -32,7 +32,7 @@ import urllib.parse as url import urllib.request as http import webbrowser -VERSION = '0.4.1' +VERSION = '0.4.2' class Failure(Exception): def __init__(self, message, status=0, payload=None): @@ -569,7 +569,7 @@ def tasks(client, profile, words): for name in ('done','reopen','archive','start'): p=sub.add_parser(name);p.add_argument('uuid',type=task_uuid) sub.add_parser('stop');sub.add_parser('status') - p=sub.add_parser('retry');p.add_argument('request_id',type=task_uuid) + p=sub.add_parser('retry');p.add_argument('request_id',type=task_uuid);p.add_argument('--recreate-deleted',action='store_true',help='Explicitly recreate a deleted capture with a new UUID; preserve and relink any existing Wiki page') p=sub.add_parser('report');p.add_argument('--from',dest='start');p.add_argument('--to',dest='end') p=sub.add_parser('preferences');p.add_argument('--wiki-prefix');p.add_argument('--project');p.add_argument('--assignee');p.add_argument('--due-days',type=int);p.add_argument('--start-days',type=int);p.add_argument('--planned-days',type=int);p.add_argument('--review-days',type=int);p.add_argument('--estimate',type=int);p.add_argument('--complexity',type=int);p.add_argument('--digest',choices=['on','off']);p.add_argument('--at');p.add_argument('--timezone') for child in sub.choices.values():child.add_argument('--json',action='store_true') @@ -583,6 +583,14 @@ def tasks(client, profile, words): if replaced:print('Replaced the retained draft with the current input.',file=sys.stderr) try: result=client.json(TASK_API+'capture',method='POST',data=payload) except Failure as e: + if e.status==410 and e.payload.get('error')=='deleted': + raise Failure('Draft retained. This task was deleted; normal retry will not restore it. To explicitly create a new task (preserving any existing Wiki body), use: pages task retry '+payload['request_id']+' --recreate-deleted',e.status,e.payload) from e + if e.status==409 and e.payload.get('error')=='capture_missing': + raise Failure('Draft retained. The server has a capture receipt but no task or deletion record. Server-side consistency repair is required; retry will not fix it.',e.status,e.payload) from e + if e.status==412: + raise Failure('Draft retained. This request ID conflicts with a server capture or task. An unchanged retry will not resolve it; inspect with: pages task show '+payload['request_id'],e.status,e.payload) from e + if e.status==409 and e.payload.get('error')=='note_exists': + raise Failure('Draft retained. A Wiki page already occupies the destination; it was not overwritten.',e.status,e.payload) from e print('Draft retained; retry with: pages task retry '+payload['request_id'],file=sys.stderr) if e.payload.get('error') == 'wiki_prefix_required': raise Failure('Set a private Wiki destination first: pages task preferences --wiki-prefix /YOUR/MAIL/PATH',e.status) from e raise @@ -607,6 +615,19 @@ def tasks(client, profile, words): if action=='retry': payload=profile.data.get('task_outbox',{}).get(a.request_id) if not payload:raise Failure('No retained task capture with this request ID.') + if a.recreate_deleted: + pending=profile.data['task_outbox'] + replacement=str(uuid.uuid5(uuid.NAMESPACE_URL,'pages:task-recreate:'+a.request_id)) + payload=dict(payload,request_id=replacement,replaces_deleted=a.request_id) + if replacement in pending and pending[replacement]!=payload: + raise Failure('A different recreation draft already exists; inspect or retry it first: '+replacement) + previous=pending.copy() + pending[replacement]=payload;del pending[a.request_id] + try:profile.save() + except Exception: + profile.data['task_outbox']=previous + raise + print('Recreation draft saved. Existing Wiki content will be preserved. Retry ID: '+replacement,file=sys.stderr) emit(capture(payload));return if action in ('add','from-mail'): payload={'request_id':getattr(a,'request_id',None) or str(uuid.uuid4()),'title':a.title,'notes':a.notes or ''} diff --git a/test_productivity.py b/test_productivity.py index 72370bd..920e342 100644 --- a/test_productivity.py +++ b/test_productivity.py @@ -9,6 +9,74 @@ import unittest m=runpy.run_path(str(Path(__file__).with_name('pages'))) class ProductivityTests(unittest.TestCase): + def test_deleted_capture_message_retains_draft_without_retry_loop(self): + ident='b5550cab-22d4-54eb-b06d-3b432d3f5101' + original={'request_id':ident,'title':'Private title','notes':'Private notes'} + for status,code,message in [(410,'deleted','--recreate-deleted'),(409,'capture_missing','consistency repair'),(412,'conflict','unchanged retry'),(409,'note_exists','not overwritten')]: + profile=SimpleNamespace(data={'task_outbox':{ident:original.copy()}},save=lambda:None) + calls=[] + def send(*args,**kw): + calls.append(kw) + raise m['Failure']('old generic message',status,{'error':code}) + output=io.StringIO() + with contextlib.redirect_stderr(output),self.assertRaises(m['Failure']) as error: + m['tasks'](SimpleNamespace(json=send),profile,['retry',ident]) + self.assertIn(message,str(error.exception)) + self.assertNotIn('Private',str(error.exception)+output.getvalue()) + self.assertNotIn('retry with:',output.getvalue()) + self.assertEqual(profile.data['task_outbox'][ident],original) + self.assertEqual(len(calls),1) + + def test_recreate_deleted_persists_successor_and_retries_same_id(self): + import uuid + ident='b5550cab-22d4-54eb-b06d-3b432d3f5101' + replacement=str(uuid.uuid5(uuid.NAMESPACE_URL,'pages:task-recreate:'+ident)) + payload={'request_id':ident,'title':'Private title','wiki_body':'Private body','wiki_suffix':'2030/01/'+ident} + saved,calls=[],[] + profile=SimpleNamespace(data={'task_outbox':{ident:payload.copy()}}) + profile.save=lambda:saved.append(json.loads(json.dumps(profile.data))) + def send(route,**kw): + calls.append(kw['data'].copy()) + self.assertEqual(saved[-1]['task_outbox'][replacement],kw['data']) + self.assertNotIn(ident,saved[-1]['task_outbox']) + if len(calls)==1:raise m['Failure']('Connection lost') + return {'item':{'uuid':replacement}} + output,error=io.StringIO(),io.StringIO() + with contextlib.redirect_stdout(output),contextlib.redirect_stderr(error): + with self.assertRaises(m['Failure']):m['tasks'](SimpleNamespace(json=send),profile,['retry',ident,'--recreate-deleted']) + self.assertEqual(len(profile.data['task_outbox']),1) + m['tasks'](SimpleNamespace(json=send),profile,['retry',replacement]) + self.assertEqual(calls[0],calls[1]) + self.assertEqual(calls[0]['request_id'],replacement) + self.assertEqual(calls[0]['replaces_deleted'],ident) + self.assertEqual(calls[0]['wiki_suffix'],payload['wiki_suffix']) + self.assertEqual(calls[0]['wiki_body'],payload['wiki_body']) + self.assertEqual(profile.data['task_outbox'],{}) + self.assertIn(replacement,error.getvalue()) + self.assertNotIn('Private',error.getvalue()) + + def test_recreate_deleted_save_failure_keeps_original_and_sends_nothing(self): + ident='b5550cab-22d4-54eb-b06d-3b432d3f5101' + payload={'request_id':ident,'title':'Draft'} + def fail():raise m['Failure']('disk full') + profile=SimpleNamespace(data={'task_outbox':{ident:payload.copy()}},save=fail) + calls=[] + with self.assertRaises(m['Failure']):m['tasks'](SimpleNamespace(json=lambda *a,**kw:calls.append(kw)),profile,['retry',ident,'--recreate-deleted']) + self.assertEqual(calls,[]) + self.assertEqual(profile.data['task_outbox'],{ident:payload}) + + def test_recreate_deleted_never_clobbers_different_successor_draft(self): + import uuid + ident='b5550cab-22d4-54eb-b06d-3b432d3f5101' + replacement=str(uuid.uuid5(uuid.NAMESPACE_URL,'pages:task-recreate:'+ident)) + pending={ident:{'request_id':ident,'title':'Original'},replacement:{'request_id':replacement,'title':'Different'}} + before=json.loads(json.dumps(pending)) + calls=[] + profile=SimpleNamespace(data={'task_outbox':pending},save=lambda:calls.append('save')) + with self.assertRaises(m['Failure']):m['tasks'](SimpleNamespace(json=lambda *a,**kw:calls.append('send')),profile,['retry',ident,'--recreate-deleted']) + self.assertEqual(calls,[]) + self.assertEqual(pending,before) + def test_mail_path_priority_and_dates(self): import datetime,hashlib ident='06cb3a24-61f8-4a9f-a0bf-89eea9632f25' diff --git a/test_task_integration.py b/test_task_integration.py index a1d603d..03d674a 100644 --- a/test_task_integration.py +++ b/test_task_integration.py @@ -54,5 +54,19 @@ def run(): assert profile.data['task_outbox'][request_id]['title']=='Changed after commit' stored=task('show',request_id)['item'] assert stored['title']=='Corrected draft' and stored['estimate_minutes']==15 + # Recreate explicitly after deletion; never revive the old DAV identity. + client.request(m['TASK_API']+'items/'+request_id,method='DELETE',etag='"'+str(stored['version'])+'"') + with contextlib.redirect_stderr(io.StringIO()): + try:task('retry',request_id) + except m['Failure'] as error: + assert error.status==410 and '--recreate-deleted' in str(error) + else:raise AssertionError('Deleted task implicitly recreated') + recreated=task('retry',request_id,'--recreate-deleted')['item'] + replacement=str(uuid.uuid5(uuid.NAMESPACE_URL,'pages:task-recreate:'+request_id)) + assert recreated['uuid']==replacement and recreated['title']=='Changed after commit' + assert recreated['estimate_minutes']==30 and not profile.data.get('task_outbox') + try:task('show',request_id) + except m['Failure'] as error:assert error.status==404 + else:raise AssertionError('Deleted UUID resurrected') if __name__=='__main__':run() diff --git a/tools/smoke_binary.py b/tools/smoke_binary.py index 7ccfa15..fee95b4 100644 --- a/tools/smoke_binary.py +++ b/tools/smoke_binary.py @@ -6,6 +6,7 @@ import subprocess import sys import tempfile import threading +import uuid from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer binary=str(Path(sys.argv[1]).resolve()) @@ -23,6 +24,8 @@ class Handler(BaseHTTPRequestHandler): item=json.loads(body) captures.append(item.copy()) if item.get('wiki_prefix')=='/rejected':self.reply({'error':'invalid'},422);return + if item.get('wiki_prefix')=='/deleted' and not item.get('replaces_deleted'):self.reply({'error':'deleted'},410);return + if item.get('replaces_deleted') and item['request_id']!=str(uuid.uuid5(uuid.NAMESPACE_URL,'pages:task-recreate:'+item['replaces_deleted'])):self.send_error(422);return if item.get('wiki_body') != 'Message-ID: \n\nPRIVATE BODY':self.send_error(422);return item.pop('wiki_body');self.reply({'item':item,'page_path':'/private/mail/synthetic'}) else:self.send_error(404) @@ -53,6 +56,10 @@ try: captured=run('task','from-mail','--wiki-prefix','/private/mail',stdin=mail) if len(captures)!=2 or captures[0]['request_id']!=captures[1]['request_id'] or captures[1]['wiki_prefix']!='/private/mail':raise AssertionError('Retained draft was not overwritten under the same request ID') if 'Mail task' not in captured or 'PRIVATE BODY' in captured:raise AssertionError('Mail privacy') + run('task','from-mail','--wiki-prefix','/deleted',stdin=mail,success=False) + deleted_id=captures[-1]['request_id'] + restored=json.loads(run('task','retry',deleted_id,'--recreate-deleted'))['item'] + if restored['request_id']!=str(uuid.uuid5(uuid.NAMESPACE_URL,'pages:task-recreate:'+deleted_id)) or restored['replaces_deleted']!=deleted_id:raise AssertionError('Recreation identity') contact=run('contacts','query','--neomutt','--','--name') if 'person@example.invalid\tSynthetic Person\tTest' not in contact:raise AssertionError('NeoMutt query') run('shell',stdin='pwd\nexit\n') @@ -62,5 +69,5 @@ try: profile.chmod(0o644);run('task','list',success=False);profile.chmod(0o600) run('logout') if not seen:raise AssertionError('No HTTP request') - print('Packaged CLI: configure/login/task-list/mail-capture/draft-overwrite/neomutt-query/shell/permissions/logout passed') + print('Packaged CLI: configure/login/task-list/mail-capture/draft-overwrite/deleted-recreation/neomutt-query/shell/permissions/logout passed') finally:server.shutdown();server.server_close();thread.join()